From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 946903858407 for ; Sun, 31 Oct 2021 08:55:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 946903858407 Received: by smtp.gentoo.org (Postfix, from userid 559) id 2B3F834341E; Sun, 31 Oct 2021 08:55:19 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 1/3] sim: nltvals: pull target open flags out into a dedicated source file Date: Sun, 31 Oct 2021 04:55:18 -0400 Message-Id: <20211031085520.29018-1-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Oct 2021 08:55:21 -0000 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 \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 . */ + +/* This must come before any other includes. */ +#include "defs.h" + +#include + +#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