* win32-nat.h: New file.
* win32-nat.c (mappings): Initialize to NULL.
(win32_set_context_register_offsets): New function.
* i386-windows-nat.c: New file.
(mappings): Moved here from win32-nat.c.
(_initialize_i386_windows_nat): New function.
* config/i386/mingw.mh (NATDEPFILES): Add i386-windows-nat.o.
* config/i386/cygwin.mh (NATDEPFILES): Likewise.
This commit is contained in:
Joel Brobecker
parent
71260a99a5
commit
7e63b4e466
@ -1,3 +1,14 @@
|
||||
2009-10-11 Joel Brobecker <brobecker@adacore.com>
|
||||
|
||||
* win32-nat.h: New file.
|
||||
* win32-nat.c (mappings): Initialize to NULL.
|
||||
(win32_set_context_register_offsets): New function.
|
||||
* i386-windows-nat.c: New file.
|
||||
(mappings): Moved here from win32-nat.c.
|
||||
(_initialize_i386_windows_nat): New function.
|
||||
* config/i386/mingw.mh (NATDEPFILES): Add i386-windows-nat.o.
|
||||
* config/i386/cygwin.mh (NATDEPFILES): Likewise.
|
||||
|
||||
2009-01-09 Andreas Schwab <schwab@suse.de>
|
||||
|
||||
* Makefile.in (init.c): Set LANG/LC_ALL to C, not c.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MH_CFLAGS=
|
||||
NATDEPFILES= i386-nat.o win32-nat.o
|
||||
NATDEPFILES= i386-nat.o win32-nat.o i386-windows-nat.o
|
||||
NAT_FILE=nm-cygwin.h
|
||||
XM_CLIBS=
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MH_CFLAGS=
|
||||
NATDEPFILES= i386-nat.o win32-nat.o
|
||||
NATDEPFILES= i386-nat.o win32-nat.o i386-windows-nat.o
|
||||
NAT_FILE=nm-cygwin.h
|
||||
XM_CLIBS=
|
||||
|
||||
76
gdb/i386-windows-nat.c
Normal file
76
gdb/i386-windows-nat.c
Normal file
@ -0,0 +1,76 @@
|
||||
/* Copyright (C) 2008, 2009 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/>. */
|
||||
|
||||
#include "defs.h"
|
||||
#include "win32-nat.h"
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#define context_offset(x) ((int)&(((CONTEXT *)NULL)->x))
|
||||
static const int mappings[] =
|
||||
{
|
||||
context_offset (Eax),
|
||||
context_offset (Ecx),
|
||||
context_offset (Edx),
|
||||
context_offset (Ebx),
|
||||
context_offset (Esp),
|
||||
context_offset (Ebp),
|
||||
context_offset (Esi),
|
||||
context_offset (Edi),
|
||||
context_offset (Eip),
|
||||
context_offset (EFlags),
|
||||
context_offset (SegCs),
|
||||
context_offset (SegSs),
|
||||
context_offset (SegDs),
|
||||
context_offset (SegEs),
|
||||
context_offset (SegFs),
|
||||
context_offset (SegGs),
|
||||
context_offset (FloatSave.RegisterArea[0 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[1 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[2 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[3 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[4 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[5 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[6 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[7 * 10]),
|
||||
context_offset (FloatSave.ControlWord),
|
||||
context_offset (FloatSave.StatusWord),
|
||||
context_offset (FloatSave.TagWord),
|
||||
context_offset (FloatSave.ErrorSelector),
|
||||
context_offset (FloatSave.ErrorOffset),
|
||||
context_offset (FloatSave.DataSelector),
|
||||
context_offset (FloatSave.DataOffset),
|
||||
context_offset (FloatSave.ErrorSelector)
|
||||
/* XMM0-7 */ ,
|
||||
context_offset (ExtendedRegisters[10*16]),
|
||||
context_offset (ExtendedRegisters[11*16]),
|
||||
context_offset (ExtendedRegisters[12*16]),
|
||||
context_offset (ExtendedRegisters[13*16]),
|
||||
context_offset (ExtendedRegisters[14*16]),
|
||||
context_offset (ExtendedRegisters[15*16]),
|
||||
context_offset (ExtendedRegisters[16*16]),
|
||||
context_offset (ExtendedRegisters[17*16]),
|
||||
/* MXCSR */
|
||||
context_offset (ExtendedRegisters[24])
|
||||
};
|
||||
#undef context_offset
|
||||
|
||||
void
|
||||
_initialize_i386_windows_nat (void)
|
||||
{
|
||||
win32_set_context_register_offsets (mappings);
|
||||
}
|
||||
@ -61,6 +61,7 @@
|
||||
#include "i387-tdep.h"
|
||||
|
||||
#include "i386-cygwin-tdep.h"
|
||||
#include "win32-nat.h"
|
||||
|
||||
static struct target_ops win32_ops;
|
||||
|
||||
@ -161,11 +162,16 @@ static int debug_memory = 0; /* show target memory accesses */
|
||||
static int debug_exceptions = 0; /* show target exceptions */
|
||||
static int useshell = 0; /* use shell for subprocesses */
|
||||
|
||||
/* This vector maps GDB's idea of a register's number into an address
|
||||
/* This vector maps GDB's idea of a register's number into an offset
|
||||
in the win32 exception context vector.
|
||||
|
||||
It also contains the bit mask needed to load the register in question.
|
||||
|
||||
The contents of this table can only be computed by the units
|
||||
that provide CPU-specific support for Windows native debugging.
|
||||
These units should set the table by calling
|
||||
win32_set_context_register_offsets.
|
||||
|
||||
One day we could read a reg, we could inspect the context we
|
||||
already have loaded, if it doesn't have the bit set that we need,
|
||||
we read that set of registers in using GetThreadContext. If the
|
||||
@ -174,55 +180,7 @@ static int useshell = 0; /* use shell for subprocesses */
|
||||
the other regs of the group, and then we copy the info in and set
|
||||
out bit. */
|
||||
|
||||
#define context_offset(x) ((int)&(((CONTEXT *)NULL)->x))
|
||||
static const int mappings[] =
|
||||
{
|
||||
context_offset (Eax),
|
||||
context_offset (Ecx),
|
||||
context_offset (Edx),
|
||||
context_offset (Ebx),
|
||||
context_offset (Esp),
|
||||
context_offset (Ebp),
|
||||
context_offset (Esi),
|
||||
context_offset (Edi),
|
||||
context_offset (Eip),
|
||||
context_offset (EFlags),
|
||||
context_offset (SegCs),
|
||||
context_offset (SegSs),
|
||||
context_offset (SegDs),
|
||||
context_offset (SegEs),
|
||||
context_offset (SegFs),
|
||||
context_offset (SegGs),
|
||||
context_offset (FloatSave.RegisterArea[0 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[1 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[2 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[3 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[4 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[5 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[6 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[7 * 10]),
|
||||
context_offset (FloatSave.ControlWord),
|
||||
context_offset (FloatSave.StatusWord),
|
||||
context_offset (FloatSave.TagWord),
|
||||
context_offset (FloatSave.ErrorSelector),
|
||||
context_offset (FloatSave.ErrorOffset),
|
||||
context_offset (FloatSave.DataSelector),
|
||||
context_offset (FloatSave.DataOffset),
|
||||
context_offset (FloatSave.ErrorSelector)
|
||||
/* XMM0-7 */ ,
|
||||
context_offset (ExtendedRegisters[10*16]),
|
||||
context_offset (ExtendedRegisters[11*16]),
|
||||
context_offset (ExtendedRegisters[12*16]),
|
||||
context_offset (ExtendedRegisters[13*16]),
|
||||
context_offset (ExtendedRegisters[14*16]),
|
||||
context_offset (ExtendedRegisters[15*16]),
|
||||
context_offset (ExtendedRegisters[16*16]),
|
||||
context_offset (ExtendedRegisters[17*16]),
|
||||
/* MXCSR */
|
||||
context_offset (ExtendedRegisters[24])
|
||||
};
|
||||
|
||||
#undef context_offset
|
||||
static const int *mappings;
|
||||
|
||||
/* This vector maps the target's idea of an exception (extracted
|
||||
from the DEBUG_EVENT structure) to GDB's idea. */
|
||||
@ -244,6 +202,15 @@ static const struct xlate_exception
|
||||
{STATUS_FLOAT_DIVIDE_BY_ZERO, TARGET_SIGNAL_FPE},
|
||||
{-1, -1}};
|
||||
|
||||
/* Set the MAPPINGS static global to OFFSETS.
|
||||
See the description of MAPPINGS for more details. */
|
||||
|
||||
void
|
||||
win32_set_context_register_offsets (const int *offsets)
|
||||
{
|
||||
mappings = offsets;
|
||||
}
|
||||
|
||||
static void
|
||||
check (BOOL ok, const char *file, int line)
|
||||
{
|
||||
|
||||
24
gdb/win32-nat.h
Normal file
24
gdb/win32-nat.h
Normal file
@ -0,0 +1,24 @@
|
||||
/* Copyright 2008, 2009 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 WIN32_NAT_H
|
||||
#define WIN32_NAT_H
|
||||
|
||||
extern void win32_set_context_register_offsets (const int *offsets);
|
||||
|
||||
#endif
|
||||
|
||||
@ -61,6 +61,7 @@
|
||||
#include "i387-tdep.h"
|
||||
|
||||
#include "i386-cygwin-tdep.h"
|
||||
#include "win32-nat.h"
|
||||
|
||||
static struct target_ops win32_ops;
|
||||
|
||||
@ -161,11 +162,16 @@ static int debug_memory = 0; /* show target memory accesses */
|
||||
static int debug_exceptions = 0; /* show target exceptions */
|
||||
static int useshell = 0; /* use shell for subprocesses */
|
||||
|
||||
/* This vector maps GDB's idea of a register's number into an address
|
||||
/* This vector maps GDB's idea of a register's number into an offset
|
||||
in the win32 exception context vector.
|
||||
|
||||
It also contains the bit mask needed to load the register in question.
|
||||
|
||||
The contents of this table can only be computed by the units
|
||||
that provide CPU-specific support for Windows native debugging.
|
||||
These units should set the table by calling
|
||||
win32_set_context_register_offsets.
|
||||
|
||||
One day we could read a reg, we could inspect the context we
|
||||
already have loaded, if it doesn't have the bit set that we need,
|
||||
we read that set of registers in using GetThreadContext. If the
|
||||
@ -174,55 +180,7 @@ static int useshell = 0; /* use shell for subprocesses */
|
||||
the other regs of the group, and then we copy the info in and set
|
||||
out bit. */
|
||||
|
||||
#define context_offset(x) ((int)&(((CONTEXT *)NULL)->x))
|
||||
static const int mappings[] =
|
||||
{
|
||||
context_offset (Eax),
|
||||
context_offset (Ecx),
|
||||
context_offset (Edx),
|
||||
context_offset (Ebx),
|
||||
context_offset (Esp),
|
||||
context_offset (Ebp),
|
||||
context_offset (Esi),
|
||||
context_offset (Edi),
|
||||
context_offset (Eip),
|
||||
context_offset (EFlags),
|
||||
context_offset (SegCs),
|
||||
context_offset (SegSs),
|
||||
context_offset (SegDs),
|
||||
context_offset (SegEs),
|
||||
context_offset (SegFs),
|
||||
context_offset (SegGs),
|
||||
context_offset (FloatSave.RegisterArea[0 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[1 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[2 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[3 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[4 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[5 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[6 * 10]),
|
||||
context_offset (FloatSave.RegisterArea[7 * 10]),
|
||||
context_offset (FloatSave.ControlWord),
|
||||
context_offset (FloatSave.StatusWord),
|
||||
context_offset (FloatSave.TagWord),
|
||||
context_offset (FloatSave.ErrorSelector),
|
||||
context_offset (FloatSave.ErrorOffset),
|
||||
context_offset (FloatSave.DataSelector),
|
||||
context_offset (FloatSave.DataOffset),
|
||||
context_offset (FloatSave.ErrorSelector)
|
||||
/* XMM0-7 */ ,
|
||||
context_offset (ExtendedRegisters[10*16]),
|
||||
context_offset (ExtendedRegisters[11*16]),
|
||||
context_offset (ExtendedRegisters[12*16]),
|
||||
context_offset (ExtendedRegisters[13*16]),
|
||||
context_offset (ExtendedRegisters[14*16]),
|
||||
context_offset (ExtendedRegisters[15*16]),
|
||||
context_offset (ExtendedRegisters[16*16]),
|
||||
context_offset (ExtendedRegisters[17*16]),
|
||||
/* MXCSR */
|
||||
context_offset (ExtendedRegisters[24])
|
||||
};
|
||||
|
||||
#undef context_offset
|
||||
static const int *mappings;
|
||||
|
||||
/* This vector maps the target's idea of an exception (extracted
|
||||
from the DEBUG_EVENT structure) to GDB's idea. */
|
||||
@ -244,6 +202,15 @@ static const struct xlate_exception
|
||||
{STATUS_FLOAT_DIVIDE_BY_ZERO, TARGET_SIGNAL_FPE},
|
||||
{-1, -1}};
|
||||
|
||||
/* Set the MAPPINGS static global to OFFSETS.
|
||||
See the description of MAPPINGS for more details. */
|
||||
|
||||
void
|
||||
win32_set_context_register_offsets (const int *offsets)
|
||||
{
|
||||
mappings = offsets;
|
||||
}
|
||||
|
||||
static void
|
||||
check (BOOL ok, const char *file, int line)
|
||||
{
|
||||
|
||||
24
gdb/windows-nat.h
Normal file
24
gdb/windows-nat.h
Normal file
@ -0,0 +1,24 @@
|
||||
/* Copyright 2008, 2009 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 WIN32_NAT_H
|
||||
#define WIN32_NAT_H
|
||||
|
||||
extern void win32_set_context_register_offsets (const int *offsets);
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user