From: "Ram Nalamothu (QUIC)" <quic_vnalamot@quicinc.com>
To: "newlib@sourceware.org" <newlib@sourceware.org>,
"kito.cheng@sifive.com" <kito.cheng@sifive.com>,
"craig.blackmore@embecosm.com" <craig.blackmore@embecosm.com>
Subject: [PATCH] RISC-V: fix setting up std streams in init_semihosting()
Date: Wed, 3 Jan 2024 08:03:49 +0000 [thread overview]
Message-ID: <BY5PR02MB6387C6F3D1743FB714AFDA9FF060A@BY5PR02MB6387.namprd02.prod.outlook.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
Without this patch, the following simple test would fail to run as expected.
#include <stdio.h>
int main() {
int n;
printf("Enter a number\n");
scanf("%d", &n);
printf("Entered number: %d\n", n);
return 0;
}
If the patch looks good, could someone please commit it on behalf of me as I don't have commit rights.
-- 8< --
Currently init_semihosting() assumes the return value from _open()
call as the file descriptor handle and that is incorrect.
The semihost _open() call returns the fdtable index returned by the
__add_fdentry() for the file opened.
[-- Attachment #2: 0001-RISC-V-fix-setting-up-std-streams-in-init_semihostin.patch --]
[-- Type: application/octet-stream, Size: 2051 bytes --]
From 966aa280a1c51759ff8ab8e6cdda225a2093f17b Mon Sep 17 00:00:00 2001
From: Venkata Ramanaiah Nalamothu <quic_vnalamot@quicinc.com>
Date: Wed, 3 Jan 2024 12:22:16 +0530
Subject: [PATCH] RISC-V: fix setting up std streams in init_semihosting()
To: newlib@sourceware.org,
kito.cheng@sifive.com,
craig.blackmore@embecosm.com
Currently init_semihosting() assumes the return value from _open()
call as the file descriptor handle and that is incorrect.
The semihost _open() call returns the fdtable index returned by the
__add_fdentry() for the file opened.
---
libgloss/riscv/semihost-sys_fdtable.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/libgloss/riscv/semihost-sys_fdtable.c b/libgloss/riscv/semihost-sys_fdtable.c
index 152c92d15..d62e3f970 100644
--- a/libgloss/riscv/semihost-sys_fdtable.c
+++ b/libgloss/riscv/semihost-sys_fdtable.c
@@ -24,25 +24,26 @@ static struct fdentry fdtable[RISCV_MAX_OPEN_FILES];
void __attribute__ ((constructor))
init_semihosting ()
{
- int handle;
+ int i;
- for (int i=0; i<RISCV_MAX_OPEN_FILES; i++)
+ for (i=0; i<RISCV_MAX_OPEN_FILES; i++)
fdtable[i].handle = -1;
- /* Set up std streams. */
+ /* Set up std streams. Note that the semihost _open() call returns an index
+ into the fdtable. */
/* stdin. */
- handle = _open (":tt", O_RDONLY);
- fdtable[STDIN_FILENO].handle = handle;
+ i = _open (":tt", O_RDONLY);
+ fdtable[STDIN_FILENO].handle = fdtable[i].handle;
fdtable[STDIN_FILENO].pos = 0;
/* stdout. */
- handle = _open (":tt", O_WRONLY|O_CREAT|O_TRUNC);
- fdtable[STDOUT_FILENO].handle = handle;
+ i = _open (":tt", O_WRONLY|O_CREAT|O_TRUNC);
+ fdtable[STDOUT_FILENO].handle = fdtable[i].handle;
fdtable[STDOUT_FILENO].pos = 0;
/* stderr. */
- handle = _open (":tt", O_WRONLY|O_CREAT|O_APPEND);
- fdtable[STDERR_FILENO].handle = handle;
+ i = _open (":tt", O_WRONLY|O_CREAT|O_APPEND);
+ fdtable[STDERR_FILENO].handle = fdtable[i].handle;
fdtable[STDERR_FILENO].pos = 0;
}
--
2.17.1
next reply other threads:[~2024-01-03 8:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-03 8:03 Ram Nalamothu (QUIC) [this message]
2024-01-03 8:17 ` Kito Cheng
2024-01-05 11:52 ` Ram Nalamothu (QUIC)
2024-01-10 7:57 ` Ram Nalamothu (QUIC)
2024-01-10 9:47 ` Corinna Vinschen
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=BY5PR02MB6387C6F3D1743FB714AFDA9FF060A@BY5PR02MB6387.namprd02.prod.outlook.com \
--to=quic_vnalamot@quicinc.com \
--cc=craig.blackmore@embecosm.com \
--cc=kito.cheng@sifive.com \
--cc=newlib@sourceware.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).