* [PATCH] Define an error function in the PPC simulator.
@ 2016-11-24 15:31 John Baldwin
2016-11-25 16:49 ` Mike Frysinger
0 siblings, 1 reply; 6+ messages in thread
From: John Baldwin @ 2016-11-24 15:31 UTC (permalink / raw)
To: gdb-patches
Previously this used the error function from GDB directly instead of
the error method in the host callbacks structure. This was exposed via
a link error when GDB was converted to C++. The error function invokes
the error callback similar to sim_io_error.
sim/ppc/ChangeLog:
* sim_calls.c (error): New function.
---
sim/ppc/ChangeLog | 4 ++++
sim/ppc/sim_calls.c | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 7ed024e..f7d8ffb 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-24 John Baldwin <jhb@FreeBSD.org>
+
+ * sim_calls.c (error): New function.
+
2016-01-10 Mike Frysinger <vapier@gentoo.org>
* configure.ac (sim-assert): Call AC_MSG_CHECKING,
diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c
index 470c958..eb5d1a7 100644
--- a/sim/ppc/sim_calls.c
+++ b/sim/ppc/sim_calls.c
@@ -386,6 +386,16 @@ sim_io_error (SIM_DESC sd, const char *fmt, ...)
/****/
+void NORETURN
+error (const char *msg, ...)
+{
+ va_list ap;
+ va_start(ap, msg);
+ callbacks->evprintf_filtered (callbacks, msg, ap);
+ va_end(ap);
+ callbacks->error (callbacks, "");
+}
+
void *
zalloc(long size)
{
--
2.9.2
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Define an error function in the PPC simulator.
2016-11-24 15:31 [PATCH] Define an error function in the PPC simulator John Baldwin
@ 2016-11-25 16:49 ` Mike Frysinger
2016-11-25 18:20 ` John Baldwin
0 siblings, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2016-11-25 16:49 UTC (permalink / raw)
To: John Baldwin; +Cc: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
On 24 Nov 2016 07:29, John Baldwin wrote:
> Previously this used the error function from GDB directly instead of
> the error method in the host callbacks structure. This was exposed via
> a link error when GDB was converted to C++. The error function invokes
> the error callback similar to sim_io_error.
ppc/main.c and ppc/misc.c already have error() definitions
-mike
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Define an error function in the PPC simulator.
2016-11-25 16:49 ` Mike Frysinger
@ 2016-11-25 18:20 ` John Baldwin
2016-11-26 22:20 ` Mike Frysinger
0 siblings, 1 reply; 6+ messages in thread
From: John Baldwin @ 2016-11-25 18:20 UTC (permalink / raw)
To: Mike Frysinger; +Cc: gdb-patches
On Friday, November 25, 2016 08:49:08 AM Mike Frysinger wrote:
> On 24 Nov 2016 07:29, John Baldwin wrote:
> > Previously this used the error function from GDB directly instead of
> > the error method in the host callbacks structure. This was exposed via
> > a link error when GDB was converted to C++. The error function invokes
> > the error callback similar to sim_io_error.
>
> ppc/main.c and ppc/misc.c already have error() definitions
Yes, though those are not included when libsim is linked into gdb itself.
misc.o is explicitly included for certain binaries in sim/ppc/Makefile.in.
Note that zalloc() is defined in both misc.c and sim_calls.c as well, I
suspect for similar reasons.
Looking at main.c, it overrides various symbols (sim_io_*, also
zalloc) that are defined in sim_calls.c with local versions. (Perhaps
psim should not be linking sim_calls.o in at all?) 'error' is another
such symbol.
--
John Baldwin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Define an error function in the PPC simulator.
2016-11-25 18:20 ` John Baldwin
@ 2016-11-26 22:20 ` Mike Frysinger
2016-12-06 20:18 ` John Baldwin
0 siblings, 1 reply; 6+ messages in thread
From: Mike Frysinger @ 2016-11-26 22:20 UTC (permalink / raw)
To: John Baldwin; +Cc: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 1214 bytes --]
On 25 Nov 2016 09:21, John Baldwin wrote:
> On Friday, November 25, 2016 08:49:08 AM Mike Frysinger wrote:
> > On 24 Nov 2016 07:29, John Baldwin wrote:
> > > Previously this used the error function from GDB directly instead of
> > > the error method in the host callbacks structure. This was exposed via
> > > a link error when GDB was converted to C++. The error function invokes
> > > the error callback similar to sim_io_error.
> >
> > ppc/main.c and ppc/misc.c already have error() definitions
>
> Yes, though those are not included when libsim is linked into gdb itself.
> misc.o is explicitly included for certain binaries in sim/ppc/Makefile.in.
> Note that zalloc() is defined in both misc.c and sim_calls.c as well, I
> suspect for similar reasons.
>
> Looking at main.c, it overrides various symbols (sim_io_*, also
> zalloc) that are defined in sim_calls.c with local versions. (Perhaps
> psim should not be linking sim_calls.o in at all?) 'error' is another
> such symbol.
yes, the ppc sim is a bit of mess due to its history. i'm not sure we
should just keep throwing onto the pile though.
if psim/main.c doesn't need it, then dropping it sounds easy enough.
-mike
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Define an error function in the PPC simulator.
2016-11-26 22:20 ` Mike Frysinger
@ 2016-12-06 20:18 ` John Baldwin
2016-12-23 21:29 ` John Baldwin
0 siblings, 1 reply; 6+ messages in thread
From: John Baldwin @ 2016-12-06 20:18 UTC (permalink / raw)
To: Mike Frysinger; +Cc: gdb-patches
On Saturday, November 26, 2016 02:19:46 PM Mike Frysinger wrote:
> On 25 Nov 2016 09:21, John Baldwin wrote:
> > On Friday, November 25, 2016 08:49:08 AM Mike Frysinger wrote:
> > > On 24 Nov 2016 07:29, John Baldwin wrote:
> > > > Previously this used the error function from GDB directly instead of
> > > > the error method in the host callbacks structure. This was exposed via
> > > > a link error when GDB was converted to C++. The error function invokes
> > > > the error callback similar to sim_io_error.
> > >
> > > ppc/main.c and ppc/misc.c already have error() definitions
> >
> > Yes, though those are not included when libsim is linked into gdb itself.
> > misc.o is explicitly included for certain binaries in sim/ppc/Makefile.in.
> > Note that zalloc() is defined in both misc.c and sim_calls.c as well, I
> > suspect for similar reasons.
> >
> > Looking at main.c, it overrides various symbols (sim_io_*, also
> > zalloc) that are defined in sim_calls.c with local versions. (Perhaps
> > psim should not be linking sim_calls.o in at all?) 'error' is another
> > such symbol.
>
> yes, the ppc sim is a bit of mess due to its history. i'm not sure we
> should just keep throwing onto the pile though.
>
> if psim/main.c doesn't need it, then dropping it sounds easy enough.
I misread the Makefiles a bit and psim doesn't link in sim_calls.o, so it
still needs its own zalloc() and error() in main.c.
In particular, ppc/Makefile generates the libsim.a that gdb links against
which includes sim_calls.o (via GDB_OBJ) but not main.o or misc.o. The
psim binary includes main.o (but not sim_calls.o or misc.o), and the other
binaries (igen, dgen, tmp-filter) include misc.o (but not sim_calls.o or
main.o).
While it might make sense to merge bits of main.c with misc.c, I think the
GDB-specific functions in sim_calls.c are always going to be required
(including a custom error() that invokes GDB's error hook).
--
John Baldwin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Define an error function in the PPC simulator.
2016-12-06 20:18 ` John Baldwin
@ 2016-12-23 21:29 ` John Baldwin
0 siblings, 0 replies; 6+ messages in thread
From: John Baldwin @ 2016-12-23 21:29 UTC (permalink / raw)
To: gdb-patches; +Cc: Mike Frysinger
On Tuesday, December 06, 2016 11:08:07 AM John Baldwin wrote:
> On Saturday, November 26, 2016 02:19:46 PM Mike Frysinger wrote:
> > On 25 Nov 2016 09:21, John Baldwin wrote:
> > > On Friday, November 25, 2016 08:49:08 AM Mike Frysinger wrote:
> > > > On 24 Nov 2016 07:29, John Baldwin wrote:
> > > > > Previously this used the error function from GDB directly instead of
> > > > > the error method in the host callbacks structure. This was exposed via
> > > > > a link error when GDB was converted to C++. The error function invokes
> > > > > the error callback similar to sim_io_error.
> > > >
> > > > ppc/main.c and ppc/misc.c already have error() definitions
> > >
> > > Yes, though those are not included when libsim is linked into gdb itself.
> > > misc.o is explicitly included for certain binaries in sim/ppc/Makefile.in.
> > > Note that zalloc() is defined in both misc.c and sim_calls.c as well, I
> > > suspect for similar reasons.
> > >
> > > Looking at main.c, it overrides various symbols (sim_io_*, also
> > > zalloc) that are defined in sim_calls.c with local versions. (Perhaps
> > > psim should not be linking sim_calls.o in at all?) 'error' is another
> > > such symbol.
> >
> > yes, the ppc sim is a bit of mess due to its history. i'm not sure we
> > should just keep throwing onto the pile though.
> >
> > if psim/main.c doesn't need it, then dropping it sounds easy enough.
>
> I misread the Makefiles a bit and psim doesn't link in sim_calls.o, so it
> still needs its own zalloc() and error() in main.c.
>
> In particular, ppc/Makefile generates the libsim.a that gdb links against
> which includes sim_calls.o (via GDB_OBJ) but not main.o or misc.o. The
> psim binary includes main.o (but not sim_calls.o or misc.o), and the other
> binaries (igen, dgen, tmp-filter) include misc.o (but not sim_calls.o or
> main.o).
>
> While it might make sense to merge bits of main.c with misc.c, I think the
> GDB-specific functions in sim_calls.c are always going to be required
> (including a custom error() that invokes GDB's error hook).
*ping* (This fixes PR sim/20863 btw)
--
John Baldwin
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-12-23 21:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-24 15:31 [PATCH] Define an error function in the PPC simulator John Baldwin
2016-11-25 16:49 ` Mike Frysinger
2016-11-25 18:20 ` John Baldwin
2016-11-26 22:20 ` Mike Frysinger
2016-12-06 20:18 ` John Baldwin
2016-12-23 21:29 ` John Baldwin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).