* [PATCH 1/3] sim: nltvals: pull target open flags out into a dedicated source file
@ 2021-10-31 8:55 Mike Frysinger
2021-10-31 8:55 ` [PATCH 2/3] sim: unify callback.o building Mike Frysinger
2021-10-31 8:55 ` [PATCH 3/3] sim: drop unused targ-vals.h includes Mike Frysinger
0 siblings, 2 replies; 3+ messages in thread
From: Mike Frysinger @ 2021-10-31 8:55 UTC (permalink / raw)
To: gdb-patches
Like we just did for pulling out the errno & signal maps, pull out the
open flag map into a dedicated common file. All newlib ports are using
the same map which makes it easy.
---
sim/Makefile.in | 19 ++++++++
sim/common/Make-common.in | 1 +
sim/common/gentmap.c | 20 --------
sim/common/local.mk | 1 +
sim/common/nltvals.def | 25 ----------
sim/common/target-newlib-open.c | 85 +++++++++++++++++++++++++++++++++
6 files changed, 106 insertions(+), 45 deletions(-)
create mode 100644 sim/common/target-newlib-open.c
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index d6b34d521229..e5c3484c047e 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -232,6 +232,7 @@ COMMON_OBJS_NAMES = \
portability.o \
sim-load.o \
target-newlib-errno.o \
+ target-newlib-open.o \
target-newlib-signal.o \
version.o
COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/common_libcommon_a-%)
diff --git a/sim/common/gentmap.c b/sim/common/gentmap.c
index 2c7288bd6056..4a55c2966943 100644
--- a/sim/common/gentmap.c
+++ b/sim/common/gentmap.c
@@ -16,13 +16,6 @@ static struct tdefs sys_tdefs[] = {
{ 0, 0 }
};
-static struct tdefs open_tdefs[] = {
-#define open_defs
-#include "nltvals.def"
-#undef open_defs
- { 0, 0 }
-};
-
static void
gen_targ_vals_h (void)
{
@@ -51,7 +44,6 @@ gen_targ_map_c (void)
printf ("/* This file is machine generated by gentmap.c. */\n\n");
printf ("#include \"defs.h\"\n");
- printf ("#include <fcntl.h>\n");
printf ("#include \"ansidecl.h\"\n");
printf ("#include \"sim/callback.h\"\n");
printf ("#include \"targ-vals.h\"\n");
@@ -68,18 +60,6 @@ gen_targ_map_c (void)
}
printf (" { 0, -1, -1 }\n");
printf ("};\n\n");
-
- printf ("/* open flags mapping table */\n");
- printf ("CB_TARGET_DEFS_MAP cb_init_open_map[] = {\n");
- for (t = &open_tdefs[0]; t->symbol; ++t)
- {
- printf ("#define TARGET_%s 0x%x\n", t->symbol, t->value);
- printf ("#ifdef %s\n", t->symbol);
- printf (" { \"%s\", %s, TARGET_%s },\n", t->symbol, t->symbol, t->symbol);
- printf ("#endif\n");
- }
- printf (" { 0, -1, -1 }\n");
- printf ("};\n\n");
}
int
diff --git a/sim/common/local.mk b/sim/common/local.mk
index bf5eda0b0d3b..fdbdca444b3f 100644
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -37,6 +37,7 @@ noinst_LIBRARIES += %D%/libcommon.a
%D%/portability.c \
%D%/sim-load.c \
%D%/target-newlib-errno.c \
+ %D%/target-newlib-open.c \
%D%/target-newlib-signal.c \
%D%/version.c
diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def
index 6d44d03ea5b4..54035cef698f 100644
--- a/sim/common/nltvals.def
+++ b/sim/common/nltvals.def
@@ -1,30 +1,5 @@
/* Newlib/libgloss macro values needed by remote target support. */
/* This file is machine generated by gennltvals.py. */
-#ifdef open_defs
-/* from fcntl.h */
-/* from sys/fcntl.h */
-/* from sys/_default_fcntl.h */
-/* begin open target macros */
- { "O_ACCMODE", (0|1|2) },
- { "O_APPEND", 0x0008 },
- { "O_CLOEXEC", 0x40000 },
- { "O_CREAT", 0x0200 },
- { "O_DIRECT", 0x80000 },
- { "O_DIRECTORY", 0x200000 },
- { "O_EXCL", 0x0800 },
- { "O_EXEC", 0x400000 },
- { "O_NOCTTY", 0x8000 },
- { "O_NOFOLLOW", 0x100000 },
- { "O_NONBLOCK", 0x4000 },
- { "O_RDONLY", 0 },
- { "O_RDWR", 2 },
- { "O_SEARCH", 0x400000 },
- { "O_SYNC", 0x2000 },
- { "O_TRUNC", 0x0400 },
- { "O_WRONLY", 1 },
-#undef open_defs
-/* end open target macros */
-#endif
#ifdef NL_TARGET_cr16
#ifdef sys_defs
/* from syscall.h */
diff --git a/sim/common/target-newlib-open.c b/sim/common/target-newlib-open.c
new file mode 100644
index 000000000000..8198109f5cdf
--- /dev/null
+++ b/sim/common/target-newlib-open.c
@@ -0,0 +1,85 @@
+/* Target errno mappings for newlib/libgloss environment.
+ Copyright 1995-2021 Free Software Foundation, Inc.
+ Contributed by Mike Frysinger.
+
+ This file is part of simulators.
+
+ 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/>. */
+
+/* This must come before any other includes. */
+#include "defs.h"
+
+#include <fcntl.h>
+
+#include "sim/callback.h"
+
+/* This file is kept up-to-date via the gennltvals.py script. Do not edit
+ anything between the START & END comment blocks below. */
+
+CB_TARGET_DEFS_MAP cb_init_open_map[] = {
+ /* gennltvals: START */
+#ifdef O_ACCMODE
+ { "O_ACCMODE", O_ACCMODE, (0|1|2) },
+#endif
+#ifdef O_APPEND
+ { "O_APPEND", O_APPEND, 0x0008 },
+#endif
+#ifdef O_CLOEXEC
+ { "O_CLOEXEC", O_CLOEXEC, 0x40000 },
+#endif
+#ifdef O_CREAT
+ { "O_CREAT", O_CREAT, 0x0200 },
+#endif
+#ifdef O_DIRECT
+ { "O_DIRECT", O_DIRECT, 0x80000 },
+#endif
+#ifdef O_DIRECTORY
+ { "O_DIRECTORY", O_DIRECTORY, 0x200000 },
+#endif
+#ifdef O_EXCL
+ { "O_EXCL", O_EXCL, 0x0800 },
+#endif
+#ifdef O_EXEC
+ { "O_EXEC", O_EXEC, 0x400000 },
+#endif
+#ifdef O_NOCTTY
+ { "O_NOCTTY", O_NOCTTY, 0x8000 },
+#endif
+#ifdef O_NOFOLLOW
+ { "O_NOFOLLOW", O_NOFOLLOW, 0x100000 },
+#endif
+#ifdef O_NONBLOCK
+ { "O_NONBLOCK", O_NONBLOCK, 0x4000 },
+#endif
+#ifdef O_RDONLY
+ { "O_RDONLY", O_RDONLY, 0 },
+#endif
+#ifdef O_RDWR
+ { "O_RDWR", O_RDWR, 2 },
+#endif
+#ifdef O_SEARCH
+ { "O_SEARCH", O_SEARCH, 0x400000 },
+#endif
+#ifdef O_SYNC
+ { "O_SYNC", O_SYNC, 0x2000 },
+#endif
+#ifdef O_TRUNC
+ { "O_TRUNC", O_TRUNC, 0x0400 },
+#endif
+#ifdef O_WRONLY
+ { "O_WRONLY", O_WRONLY, 1 },
+#endif
+ /* gennltvals: END */
+ { NULL, -1, -1 },
+};
--
2.33.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/3] sim: unify callback.o building
2021-10-31 8:55 [PATCH 1/3] sim: nltvals: pull target open flags out into a dedicated source file Mike Frysinger
@ 2021-10-31 8:55 ` Mike Frysinger
2021-10-31 8:55 ` [PATCH 3/3] sim: drop unused targ-vals.h includes Mike Frysinger
1 sibling, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2021-10-31 8:55 UTC (permalink / raw)
To: gdb-patches
Now that the use of TARGET_xxx defines have been removed, we can move
this to the common logic so we only build it once for multi-targets.
---
sim/Makefile.in | 19 +++++++++++++++++++
sim/common/Make-common.in | 3 ++-
sim/common/local.mk | 1 +
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index e5c3484c047e..4c8305917643 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -229,6 +229,7 @@ EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \
$(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS)
COMMON_OBJS_NAMES = \
+ callback.o \
portability.o \
sim-load.o \
target-newlib-errno.o \
@@ -237,7 +238,7 @@ COMMON_OBJS_NAMES = \
version.o
COMMON_OBJS = $(COMMON_OBJS_NAMES:%=../common/common_libcommon_a-%)
-LIB_OBJS = callback.o modules.o syscall.o targ-map.o $(COMMON_OBJS) $(SIM_OBJS)
+LIB_OBJS = modules.o syscall.o targ-map.o $(COMMON_OBJS) $(SIM_OBJS)
COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS)
LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
diff --git a/sim/common/local.mk b/sim/common/local.mk
index fdbdca444b3f..2fd78264ba1f 100644
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -34,6 +34,7 @@ noinst_LIBRARIES += %D%/libcommon.a
-I../bfd \
-I..
%C%_libcommon_a_SOURCES = \
+ %D%/callback.c \
%D%/portability.c \
%D%/sim-load.c \
%D%/target-newlib-errno.c \
--
2.33.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3/3] sim: drop unused targ-vals.h includes
2021-10-31 8:55 [PATCH 1/3] sim: nltvals: pull target open flags out into a dedicated source file Mike Frysinger
2021-10-31 8:55 ` [PATCH 2/3] sim: unify callback.o building Mike Frysinger
@ 2021-10-31 8:55 ` Mike Frysinger
1 sibling, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2021-10-31 8:55 UTC (permalink / raw)
To: gdb-patches
This is used in a few places where it's not needed. Drop the include
to avoid the build-time generated header file as we move to drop it.
---
sim/common/sim-io.c | 1 -
sim/common/sim-syscall.c | 1 -
sim/common/syscall.c | 1 -
sim/m32r/traps.c | 1 -
sim/msp430/msp430-sim.c | 1 -
sim/riscv/sim-main.c | 2 --
6 files changed, 7 deletions(-)
diff --git a/sim/common/sim-io.c b/sim/common/sim-io.c
index a5a7ff17b067..7bb504c74296 100644
--- a/sim/common/sim-io.c
+++ b/sim/common/sim-io.c
@@ -25,7 +25,6 @@
#include "sim-main.h"
#include "sim-io.h"
#include "sim/callback.h"
-#include "targ-vals.h"
#include <errno.h>
#if HAVE_FCNTL_H
diff --git a/sim/common/sim-syscall.c b/sim/common/sim-syscall.c
index f24d761ee8fe..1e83db2ae8a4 100644
--- a/sim/common/sim-syscall.c
+++ b/sim/common/sim-syscall.c
@@ -25,7 +25,6 @@
#include "sim-main.h"
#include "sim-syscall.h"
#include "sim/callback.h"
-#include "targ-vals.h"
\f
/* Read/write functions for system call interface. */
diff --git a/sim/common/syscall.c b/sim/common/syscall.c
index 6efddcfecde8..e353d862504a 100644
--- a/sim/common/syscall.c
+++ b/sim/common/syscall.c
@@ -41,7 +41,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "sim/callback.h"
-#include "targ-vals.h"
#ifndef ENOSYS
#define ENOSYS EINVAL
diff --git a/sim/m32r/traps.c b/sim/m32r/traps.c
index 2d7738b1f3cc..0373cc7a408b 100644
--- a/sim/m32r/traps.c
+++ b/sim/m32r/traps.c
@@ -26,7 +26,6 @@
#include "sim-syscall.h"
#include "sim/callback.h"
#include "syscall.h"
-#include "targ-vals.h"
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/sim/msp430/msp430-sim.c b/sim/msp430/msp430-sim.c
index c9bb9c78db6f..6f1c14f759ee 100644
--- a/sim/msp430/msp430-sim.c
+++ b/sim/msp430/msp430-sim.c
@@ -32,7 +32,6 @@
#include "sim-main.h"
#include "sim-signal.h"
#include "sim-syscall.h"
-#include "targ-vals.h"
static sim_cia
msp430_pc_fetch (SIM_CPU *cpu)
diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c
index 0faf9395ae52..d2d4cddd291b 100644
--- a/sim/riscv/sim-main.c
+++ b/sim/riscv/sim-main.c
@@ -34,8 +34,6 @@
#include "opcode/riscv.h"
#include "gdb/sim-riscv.h"
-
-#include "targ-vals.h"
\f
#define TRACE_REG(cpu, reg) \
TRACE_REGISTER (cpu, "wrote %s = %#" PRIxTW, riscv_gpr_names_abi[reg], \
--
2.33.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-31 8:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-31 8:55 [PATCH 1/3] sim: nltvals: pull target open flags out into a dedicated source file Mike Frysinger
2021-10-31 8:55 ` [PATCH 2/3] sim: unify callback.o building Mike Frysinger
2021-10-31 8:55 ` [PATCH 3/3] sim: drop unused targ-vals.h includes Mike Frysinger
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).