yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sim: rl78: rename open symbol to avoid collisions

Browse Source 
If the header files define open(), make sure our local open var
doesn't shadow it.
This commit is contained in:
Mike Frysinger 2021-05-23 00:41:21 -04:00
parent e82a36be9a
commit 9a28444faa
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sim/rl78/ChangeLog
View File

@ -1,3 +1,9 @@
2021-05-23 Mike Frysinger <vapier@gentoo.org>
* gdb-if.c (open): Rename to ...
(is_open): ... this.
(sim_open, sim_close): Rename open to is_open.
2021-05-16 Mike Frysinger <vapier@gentoo.org>
* cpu.c, gdb-if.c, load.c, main.c, mem.c, rl78.c, trace.c: Replace

8
sim/rl78/gdb-if.c
View File

@ -56,7 +56,7 @@ static struct sim_state the_minisim = {
"This is the sole rl78 minisim instance."
};
static int open;
static int is_open;
static struct host_callback_struct *host_callbacks;
@ -69,7 +69,7 @@ sim_open (SIM_OPEN_KIND kind,
struct host_callback_struct *callback,
struct bfd *abfd, char * const *argv)
{
if (open)
if (is_open)
fprintf (stderr, "rl78 minisim: re-opened sim\n");
/* The 'run' interface doesn't use this function, so we don't care
@ -88,7 +88,7 @@ sim_open (SIM_OPEN_KIND kind,
trace = 0;
sim_disasm_init (abfd);
open = 1;
is_open = 1;
while (argv != NULL && *argv != NULL)
{
@ -145,7 +145,7 @@ sim_close (SIM_DESC sd, int quitting)
/* Not much to do. At least free up our memory. */
init_mem ();
open = 0;
is_open = 0;
}
/* Open the program to run; print a message if the program cannot