From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Alexander von Gluck IV" <kallisti5@unixzen.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Richard Zak" <richard.j.zak@gmail.com>,
"Leon Alrae" <leon.alrae@imgtec.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH 3/4] target/mips: Rewrite UHI errno_mips() using GHashTable
Date: Sun, 4 Jul 2021 19:07:35 +0200 [thread overview]
Message-ID: <20210704170736.617895-4-f4bug@amsat.org> (raw)
In-Reply-To: <20210704170736.617895-1-f4bug@amsat.org>
Linking on Haiku OS fails:
/boot/system/develop/tools/bin/../lib/gcc/x86_64-unknown-haiku/8.3.0/../../../../x86_64-unknown-haiku/bin/ld:
error: libqemu-mips-softmmu.fa.p/target_mips_tcg_sysemu_mips-semi.c.o(.rodata) is too large (0xffff405a bytes)
/boot/system/develop/tools/bin/../lib/gcc/x86_64-unknown-haiku/8.3.0/../../../../x86_64-unknown-haiku/bin/ld:
final link failed: memory exhausted
collect2: error: ld returned 1 exit status
This is because the host_to_mips_errno[] uses errno as index,
for example:
static const uint16_t host_to_mips_errno[] = {
[ENAMETOOLONG] = 91,
...
and Haiku defines [*] ENAMETOOLONG as:
12 /* Error baselines */
13 #define B_GENERAL_ERROR_BASE INT_MIN
..
22 #define B_STORAGE_ERROR_BASE (B_GENERAL_ERROR_BASE + 0x6000)
...
106 #define B_NAME_TOO_LONG (B_STORAGE_ERROR_BASE + 4)
...
211 #define ENAMETOOLONG B_TO_POSIX_ERROR(B_NAME_TOO_LONG)
so the array ends up beeing indeed too big.
Since POSIX errno can't be use as indexes on Haiku,
rewrite errno_mips() using a GHashTable.
[*] https://github.com/haiku/haiku/blob/r1beta3/headers/os/support/Errors.h#L130
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/tcg/sysemu/mips-semi.c | 62 ++++++++++++++++++++++--------
1 file changed, 45 insertions(+), 17 deletions(-)
diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mips-semi.c
index 4c924273c1b..3e91c9eb76c 100644
--- a/target/mips/tcg/sysemu/mips-semi.c
+++ b/target/mips/tcg/sysemu/mips-semi.c
@@ -4,6 +4,7 @@
* Specifications: MD01069 Reference Manual (rev 1.1.6, 06 Jul 2015)
*
* Copyright (c) 2015 Imagination Technologies
+ * Copyright (c) 2021 Philippe Mathieu-Daudé
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -76,29 +77,56 @@ enum UHIOpenFlags {
UHIOpen_EXCL = 0x800
};
-/*
- * Unified Hosting Interface (rev 1.1.6)
- * Appendix A. "Error values"
- */
-static const uint16_t host_to_mips_errno[] = {
- [ENAMETOOLONG] = 91,
-#ifdef EOVERFLOW
- [EOVERFLOW] = 139,
-#endif
+static GHashTable *uhi_errno_hash_table;
+
+static void uhi_errno_insert(int host_errno, int uhi_errno)
+{
+ gboolean ret = TRUE;
+
+ assert(uhi_errno_hash_table != NULL);
+ ret = g_hash_table_insert(uhi_errno_hash_table,
+ GINT_TO_POINTER(host_errno),
+ GINT_TO_POINTER(uhi_errno));
+ assert(ret == TRUE);
+}
+
+static void uhi_errno_init(void)
+{
+ gboolean ret = TRUE;
+
+ uhi_errno_hash_table = g_hash_table_new(NULL, NULL);
+
+ /*
+ * Unified Hosting Interface (rev 1.1.6)
+ * Appendix A. "Error values"
+ */
+ uhi_errno_insert(ENAMETOOLONG, 91);
#ifdef ELOOP
- [ELOOP] = 92,
+ uhi_errno_insert(ELOOP, 92);
#endif
-};
+#ifdef EOVERFLOW
+ uhi_errno_insert(EOVERFLOW, 139);
+#endif
+ assert(ret == TRUE);
+}
static int errno_mips(int host_errno)
{
- if (host_errno < 0 || host_errno >= ARRAY_SIZE(host_to_mips_errno)) {
- return EINVAL;
- } else if (host_to_mips_errno[host_errno]) {
- return host_to_mips_errno[host_errno];
- } else {
- return host_errno;
+ gpointer uhi_errno;
+
+ if (uhi_errno_hash_table == NULL) {
+ uhi_errno_init();
}
+
+ if (host_errno == 0) {
+ return 0;
+ }
+ if (g_hash_table_lookup_extended(uhi_errno_hash_table,
+ GINT_TO_POINTER(host_errno),
+ NULL, &uhi_errno)) {
+ return GPOINTER_TO_INT(uhi_errno);
+ }
+ return EINVAL; /* Not reachable per the specification */
}
static int copy_stat_to_target(CPUMIPSState *env, const struct stat *src,
--
2.31.1
next prev parent reply other threads:[~2021-07-04 17:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-04 17:07 [PATCH 0/4] target/mips: Rewrite UHI errno_mips() to allow building on Haiku OS Philippe Mathieu-Daudé
2021-07-04 17:07 ` [PATCH 1/4] target/mips: Fix UHI error values Philippe Mathieu-Daudé
2021-07-04 17:07 ` [PATCH 2/4] target/mips: Rename UHI err -> host_errno Philippe Mathieu-Daudé
2021-07-04 17:07 ` Philippe Mathieu-Daudé [this message]
2021-07-04 17:25 ` [PATCH 3/4] target/mips: Rewrite UHI errno_mips() using GHashTable Peter Maydell
2021-07-04 18:25 ` Philippe Mathieu-Daudé
2021-07-04 18:38 ` Thomas Huth
2021-07-04 18:44 ` Philippe Mathieu-Daudé
2021-07-04 17:07 ` [PATCH 4/4] target/mips: Complete UHI errno list and log unexpected errors Philippe Mathieu-Daudé
2021-07-04 17:23 ` Peter Maydell
2021-07-04 18:25 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210704170736.617895-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=kallisti5@unixzen.com \
--cc=leon.alrae@imgtec.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=richard.j.zak@gmail.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).