rpms/gdb/devel gdb-gdbserver-tracepoint-revert.patch, NONE, 1.1 gdb.spec, 1.396, 1.397
Jan Kratochvil
jkratoch at fedoraproject.org
Thu Jan 21 19:53:41 UTC 2010
Author: jkratoch
Update of /cvs/pkgs/rpms/gdb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15159
Modified Files:
gdb.spec
Added Files:
gdb-gdbserver-tracepoint-revert.patch
Log Message:
* Thu Jan 21 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100121-3.fc13
- Revert FSF GDB gdbserver tracepoints as incomplete now.
gdb-gdbserver-tracepoint-revert.patch:
i387-fp.c | 94 ++++++++++++++++++++++-------------------------
i387-fp.h | 8 ++--
linux-arm-low.c | 52 ++++++++++++--------------
linux-cris-low.c | 11 ++---
linux-crisv32-low.c | 84 +++++++++++++++++++-----------------------
linux-low.c | 54 ++++++++++++---------------
linux-low.h | 14 +++----
linux-m32r-low.c | 10 ++---
linux-m68k-low.c | 26 ++++++-------
linux-mips-low.c | 104 +++++++++++++++++++++-------------------------------
linux-ppc-low.c | 95 +++++++++++++++++++++++------------------------
linux-s390-low.c | 33 ++++++++--------
linux-sh-low.c | 12 +++---
linux-sparc-low.c | 45 ++++++++++------------
linux-x86-low.c | 50 ++++++++++++-------------
linux-xtensa-low.c | 56 ++++++++++++++--------------
nto-low.c | 10 ++---
proc-service.c | 7 +--
regcache.c | 91 ++++++++++++++++++++++++---------------------
regcache.h | 32 ++++------------
remote-utils.c | 9 +---
server.c | 24 +++---------
target.h | 12 +++---
win32-arm-low.c | 10 ++---
win32-i386-low.c | 14 +++----
win32-low.c | 24 +++++-------
win32-low.h | 6 +--
27 files changed, 453 insertions(+), 534 deletions(-)
--- NEW FILE gdb-gdbserver-tracepoint-revert.patch ---
http://sourceware.org/ml/gdb-cvs/2010-01/msg00183.html
REVERT
--- ./gdb/gdbserver/i387-fp.c 2010-01-20 23:55:38.000000000 +0100
+++ ./gdb/gdbserver/i387-fp.c 2010-01-21 20:33:15.000000000 +0100
@@ -73,7 +73,7 @@ struct i387_fxsave {
};
void
-i387_cache_to_fsave (struct regcache *regcache, void *buf)
+i387_cache_to_fsave (void *buf)
{
struct i387_fsave *fp = (struct i387_fsave *) buf;
int i;
@@ -81,39 +81,38 @@ i387_cache_to_fsave (struct regcache *re
unsigned long val, val2;
for (i = 0; i < 8; i++)
- collect_register (regcache, i + st0_regnum,
- ((char *) &fp->st_space[0]) + i * 10);
+ collect_register (i + st0_regnum, ((char *) &fp->st_space[0]) + i * 10);
- collect_register_by_name (regcache, "fioff", &fp->fioff);
- collect_register_by_name (regcache, "fooff", &fp->fooff);
+ collect_register_by_name ("fioff", &fp->fioff);
+ collect_register_by_name ("fooff", &fp->fooff);
/* This one's 11 bits... */
- collect_register_by_name (regcache, "fop", &val2);
+ collect_register_by_name ("fop", &val2);
fp->fop = (val2 & 0x7FF) | (fp->fop & 0xF800);
/* Some registers are 16-bit. */
- collect_register_by_name (regcache, "fctrl", &val);
+ collect_register_by_name ("fctrl", &val);
fp->fctrl = val;
- collect_register_by_name (regcache, "fstat", &val);
+ collect_register_by_name ("fstat", &val);
val &= 0xFFFF;
fp->fstat = val;
- collect_register_by_name (regcache, "ftag", &val);
+ collect_register_by_name ("ftag", &val);
val &= 0xFFFF;
fp->ftag = val;
- collect_register_by_name (regcache, "fiseg", &val);
+ collect_register_by_name ("fiseg", &val);
val &= 0xFFFF;
fp->fiseg = val;
- collect_register_by_name (regcache, "foseg", &val);
+ collect_register_by_name ("foseg", &val);
val &= 0xFFFF;
fp->foseg = val;
}
void
-i387_fsave_to_cache (struct regcache *regcache, const void *buf)
+i387_fsave_to_cache (const void *buf)
{
struct i387_fsave *fp = (struct i387_fsave *) buf;
int i;
@@ -121,35 +120,34 @@ i387_fsave_to_cache (struct regcache *re
unsigned long val;
for (i = 0; i < 8; i++)
- supply_register (regcache, i + st0_regnum,
- ((char *) &fp->st_space[0]) + i * 10);
+ supply_register (i + st0_regnum, ((char *) &fp->st_space[0]) + i * 10);
- supply_register_by_name (regcache, "fioff", &fp->fioff);
- supply_register_by_name (regcache, "fooff", &fp->fooff);
+ supply_register_by_name ("fioff", &fp->fioff);
+ supply_register_by_name ("fooff", &fp->fooff);
/* Some registers are 16-bit. */
val = fp->fctrl & 0xFFFF;
- supply_register_by_name (regcache, "fctrl", &val);
+ supply_register_by_name ("fctrl", &val);
val = fp->fstat & 0xFFFF;
- supply_register_by_name (regcache, "fstat", &val);
+ supply_register_by_name ("fstat", &val);
val = fp->ftag & 0xFFFF;
- supply_register_by_name (regcache, "ftag", &val);
+ supply_register_by_name ("ftag", &val);
val = fp->fiseg & 0xFFFF;
- supply_register_by_name (regcache, "fiseg", &val);
+ supply_register_by_name ("fiseg", &val);
val = fp->foseg & 0xFFFF;
- supply_register_by_name (regcache, "foseg", &val);
+ supply_register_by_name ("foseg", &val);
/* fop has only 11 valid bits. */
val = (fp->fop) & 0x7FF;
- supply_register_by_name (regcache, "fop", &val);
+ supply_register_by_name ("fop", &val);
}
void
-i387_cache_to_fxsave (struct regcache *regcache, void *buf)
+i387_cache_to_fxsave (void *buf)
{
struct i387_fxsave *fp = (struct i387_fxsave *) buf;
int i;
@@ -158,29 +156,27 @@ i387_cache_to_fxsave (struct regcache *r
unsigned long val, val2;
for (i = 0; i < 8; i++)
- collect_register (regcache, i + st0_regnum,
- ((char *) &fp->st_space[0]) + i * 16);
+ collect_register (i + st0_regnum, ((char *) &fp->st_space[0]) + i * 16);
for (i = 0; i < num_xmm_registers; i++)
- collect_register (regcache, i + xmm0_regnum,
- ((char *) &fp->xmm_space[0]) + i * 16);
+ collect_register (i + xmm0_regnum, ((char *) &fp->xmm_space[0]) + i * 16);
- collect_register_by_name (regcache, "fioff", &fp->fioff);
- collect_register_by_name (regcache, "fooff", &fp->fooff);
- collect_register_by_name (regcache, "mxcsr", &fp->mxcsr);
+ collect_register_by_name ("fioff", &fp->fioff);
+ collect_register_by_name ("fooff", &fp->fooff);
+ collect_register_by_name ("mxcsr", &fp->mxcsr);
/* This one's 11 bits... */
- collect_register_by_name (regcache, "fop", &val2);
+ collect_register_by_name ("fop", &val2);
fp->fop = (val2 & 0x7FF) | (fp->fop & 0xF800);
/* Some registers are 16-bit. */
- collect_register_by_name (regcache, "fctrl", &val);
+ collect_register_by_name ("fctrl", &val);
fp->fctrl = val;
- collect_register_by_name (regcache, "fstat", &val);
+ collect_register_by_name ("fstat", &val);
fp->fstat = val;
/* Convert to the simplifed tag form stored in fxsave data. */
- collect_register_by_name (regcache, "ftag", &val);
+ collect_register_by_name ("ftag", &val);
val &= 0xFFFF;
val2 = 0;
for (i = 7; i >= 0; i--)
@@ -192,10 +188,10 @@ i387_cache_to_fxsave (struct regcache *r
}
fp->ftag = val2;
- collect_register_by_name (regcache, "fiseg", &val);
+ collect_register_by_name ("fiseg", &val);
fp->fiseg = val;
- collect_register_by_name (regcache, "foseg", &val);
+ collect_register_by_name ("foseg", &val);
fp->foseg = val;
}
@@ -247,7 +243,7 @@ i387_ftag (struct i387_fxsave *fp, int r
}
void
-i387_fxsave_to_cache (struct regcache *regcache, const void *buf)
+i387_fxsave_to_cache (const void *buf)
{
struct i387_fxsave *fp = (struct i387_fxsave *) buf;
int i, top;
@@ -256,22 +252,20 @@ i387_fxsave_to_cache (struct regcache *r
unsigned long val;
for (i = 0; i < 8; i++)
- supply_register (regcache, i + st0_regnum,
- ((char *) &fp->st_space[0]) + i * 16);
+ supply_register (i + st0_regnum, ((char *) &fp->st_space[0]) + i * 16);
for (i = 0; i < num_xmm_registers; i++)
- supply_register (regcache, i + xmm0_regnum,
- ((char *) &fp->xmm_space[0]) + i * 16);
+ supply_register (i + xmm0_regnum, ((char *) &fp->xmm_space[0]) + i * 16);
- supply_register_by_name (regcache, "fioff", &fp->fioff);
- supply_register_by_name (regcache, "fooff", &fp->fooff);
- supply_register_by_name (regcache, "mxcsr", &fp->mxcsr);
+ supply_register_by_name ("fioff", &fp->fioff);
+ supply_register_by_name ("fooff", &fp->fooff);
+ supply_register_by_name ("mxcsr", &fp->mxcsr);
/* Some registers are 16-bit. */
val = fp->fctrl & 0xFFFF;
- supply_register_by_name (regcache, "fctrl", &val);
+ supply_register_by_name ("fctrl", &val);
val = fp->fstat & 0xFFFF;
- supply_register_by_name (regcache, "fstat", &val);
+ supply_register_by_name ("fstat", &val);
[...2274 lines suppressed...]
break;
case 'm':
require_running (own_buf);
--- ./gdb/gdbserver/target.h 2010-01-20 23:55:38.000000000 +0100
+++ ./gdb/gdbserver/target.h 2010-01-21 20:33:15.000000000 +0100
@@ -166,13 +166,13 @@ struct target_ops
If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
- void (*fetch_registers) (struct regcache *regcache, int regno);
+ void (*fetch_registers) (int regno);
/* Store registers to the inferior process.
If REGNO is -1, store all registers; otherwise, store at least REGNO. */
- void (*store_registers) (struct regcache *regcache, int regno);
+ void (*store_registers) (int regno);
/* Read memory from the inferior process. This should generally be
called through read_inferior_memory, which handles breakpoint shadowing.
@@ -307,11 +307,11 @@ void set_target_ops (struct target_ops *
#define mythread_alive(pid) \
(*the_target->thread_alive) (pid)
-#define fetch_inferior_registers(regcache, regno) \
- (*the_target->fetch_registers) (regcache, regno)
+#define fetch_inferior_registers(regno) \
+ (*the_target->fetch_registers) (regno)
-#define store_inferior_registers(regcache, regno) \
- (*the_target->store_registers) (regcache, regno)
+#define store_inferior_registers(regno) \
+ (*the_target->store_registers) (regno)
#define join_inferior(pid) \
(*the_target->join) (pid)
--- ./gdb/gdbserver/win32-arm-low.c 2010-01-20 23:55:38.000000000 +0100
+++ ./gdb/gdbserver/win32-arm-low.c 2010-01-21 20:33:15.000000000 +0100
@@ -93,19 +93,17 @@ regptr (CONTEXT* c, int r)
/* Fetch register from gdbserver regcache data. */
static void
-arm_fetch_inferior_register (struct regcache *regcache,
- win32_thread_info *th, int r)
+arm_fetch_inferior_register (win32_thread_info *th, int r)
{
char *context_offset = regptr (&th->context, r);
- supply_register (regcache, r, context_offset);
+ supply_register (r, context_offset);
}
/* Store a new register value into the thread context of TH. */
static void
-arm_store_inferior_register (struct regcache *regcache,
- win32_thread_info *th, int r)
+arm_store_inferior_register (win32_thread_info *th, int r)
{
- collect_register (regcache, r, regptr (&th->context, r));
+ collect_register (r, regptr (&th->context, r));
}
/* Correct in either endianness. We do not support Thumb yet. */
--- ./gdb/gdbserver/win32-i386-low.c 2010-01-20 23:55:38.000000000 +0100
+++ ./gdb/gdbserver/win32-i386-low.c 2010-01-21 20:33:15.000000000 +0100
@@ -271,8 +271,7 @@ static const int mappings[] = {
/* Fetch register from gdbserver regcache data. */
static void
-i386_fetch_inferior_register (struct regcache *regcache,
- win32_thread_info *th, int r)
+i386_fetch_inferior_register (win32_thread_info *th, int r)
{
char *context_offset = (char *) &th->context + mappings[r];
@@ -280,24 +279,23 @@ i386_fetch_inferior_register (struct reg
if (r == FCS_REGNUM)
{
l = *((long *) context_offset) & 0xffff;
- supply_register (regcache, r, (char *) &l);
+ supply_register (r, (char *) &l);
}
else if (r == FOP_REGNUM)
{
l = (*((long *) context_offset) >> 16) & ((1 << 11) - 1);
- supply_register (regcache, r, (char *) &l);
+ supply_register (r, (char *) &l);
}
else
- supply_register (regcache, r, context_offset);
+ supply_register (r, context_offset);
}
/* Store a new register value into the thread context of TH. */
static void
-i386_store_inferior_register (struct regcache *regcache,
- win32_thread_info *th, int r)
+i386_store_inferior_register (win32_thread_info *th, int r)
{
char *context_offset = (char *) &th->context + mappings[r];
- collect_register (regcache, r, context_offset);
+ collect_register (r, context_offset);
}
static const unsigned char i386_win32_breakpoint = 0xcc;
--- ./gdb/gdbserver/win32-low.c 2010-01-20 23:55:38.000000000 +0100
+++ ./gdb/gdbserver/win32-low.c 2010-01-21 20:33:15.000000000 +0100
@@ -372,29 +372,29 @@ child_continue (DWORD continue_status, i
/* Fetch register(s) from the current thread context. */
static void
-child_fetch_inferior_registers (struct regcache *regcache, int r)
+child_fetch_inferior_registers (int r)
{
int regno;
win32_thread_info *th = thread_rec (current_inferior_ptid (), TRUE);
if (r == -1 || r > NUM_REGS)
- child_fetch_inferior_registers (regcache, NUM_REGS);
+ child_fetch_inferior_registers (NUM_REGS);
else
for (regno = 0; regno < r; regno++)
- (*the_low_target.fetch_inferior_register) (regcache, th, regno);
+ (*the_low_target.fetch_inferior_register) (th, regno);
}
/* Store a new register value into the current thread context. We don't
change the program's context until later, when we resume it. */
static void
-child_store_inferior_registers (struct regcache *regcache, int r)
+child_store_inferior_registers (int r)
{
int regno;
win32_thread_info *th = thread_rec (current_inferior_ptid (), TRUE);
if (r == -1 || r == 0 || r > NUM_REGS)
- child_store_inferior_registers (regcache, NUM_REGS);
+ child_store_inferior_registers (NUM_REGS);
else
for (regno = 0; regno < r; regno++)
- (*the_low_target.store_inferior_register) (regcache, th, regno);
+ (*the_low_target.store_inferior_register) (th, regno);
}
/* Map the Windows error number in ERROR to a locale-dependent error
@@ -1569,7 +1569,6 @@ static ptid_t
win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options)
{
struct process_info *process;
- struct regcache *regcache;
while (1)
{
@@ -1591,8 +1590,7 @@ win32_wait (ptid_t ptid, struct target_w
OUTMSG2 (("Child Stopped with signal = %d \n",
ourstatus->value.sig));
- regcache = get_thread_regcache (current_inferior, 1);
- child_fetch_inferior_registers (regcache, -1);
+ child_fetch_inferior_registers (-1);
if (ourstatus->kind == TARGET_WAITKIND_LOADED
&& !server_waiting)
@@ -1624,17 +1622,17 @@ win32_wait (ptid_t ptid, struct target_w
/* Fetch registers from the inferior process.
If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
static void
-win32_fetch_inferior_registers (struct regcache *regcache, int regno)
+win32_fetch_inferior_registers (int regno)
{
- child_fetch_inferior_registers (regcache, regno);
+ child_fetch_inferior_registers (regno);
}
/* Store registers to the inferior process.
If REGNO is -1, store all registers; otherwise, store at least REGNO. */
static void
-win32_store_inferior_registers (struct regcache *regcache, int regno)
+win32_store_inferior_registers (int regno)
{
- child_store_inferior_registers (regcache, regno);
+ child_store_inferior_registers (regno);
}
/* Read memory from the inferior process. This should generally be
--- ./gdb/gdbserver/win32-low.h 2010-01-20 23:55:38.000000000 +0100
+++ ./gdb/gdbserver/win32-low.h 2010-01-21 20:33:15.000000000 +0100
@@ -61,12 +61,10 @@ struct win32_target_ops
void (*thread_added) (win32_thread_info *th);
/* Fetch register from gdbserver regcache data. */
- void (*fetch_inferior_register) (struct regcache *regcache,
- win32_thread_info *th, int r);
+ void (*fetch_inferior_register) (win32_thread_info *th, int r);
/* Store a new register value into the thread context of TH. */
- void (*store_inferior_register) (struct regcache *regcache,
- win32_thread_info *th, int r);
+ void (*store_inferior_register) (win32_thread_info *th, int r);
void (*single_step) (win32_thread_info *th);
Index: gdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -p -r1.396 -r1.397
--- gdb.spec 21 Jan 2010 18:25:34 -0000 1.396
+++ gdb.spec 21 Jan 2010 19:53:41 -0000 1.397
@@ -36,7 +36,7 @@ Version: 7.0.50.20100121
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 2%{?_with_upstream:.upstream}%{dist}
+Release: 3%{?_with_upstream:.upstream}%{dist}
License: GPLv3+
Group: Development/Debuggers
@@ -428,6 +428,9 @@ Patch411: gdb-solib-display.patch
# Revert: Add -Wunused-function to compile flags.
Patch412: gdb-unused-revert.patch
+# Revert FSF GDB gdbserver tracepoints as incomplete now.
+Patch413: gdb-gdbserver-tracepoint-revert.patch
+
BuildRequires: ncurses-devel%{?_isa} texinfo gettext flex bison expat-devel%{?_isa}
Requires: readline%{?_isa}
BuildRequires: readline-devel%{?_isa}
@@ -673,6 +676,7 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc
%patch408 -p1
%patch411 -p1
%patch412 -p1
+%patch413 -p1
# Always verify its applicability.
%patch393 -p1
%patch335 -p1
@@ -998,6 +1002,9 @@ fi
%endif
%changelog
+* Thu Jan 21 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100121-3.fc13
+- Revert FSF GDB gdbserver tracepoints as incomplete now.
+
* Thu Jan 21 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.0.50.20100121-2.fc13
- archer-jankratochvil-fedora13 commit: 21e418c04290aa5d2e75543d31fe3fe5d70d6d41
- [expr-cumulative] Fix "break expr if (cond)" regression.
More information about the scm-commits
mailing list