* [PATCH] libgloss: Fix lseek semihosting bug on nios2 and m68k
@ 2020-02-05 4:34 Sandra Loosemore
2020-02-06 10:03 ` Corinna Vinschen
0 siblings, 1 reply; 2+ messages in thread
From: Sandra Loosemore @ 2020-02-05 4:34 UTC (permalink / raw)
To: newlib
When off_t is 32 bits, the value needs to be sign-extended to 64 bits
before shifting right to extract the high-order word. Previously
negative offsets were incorrectly encoded.
Signed-off-by: Sandra Loosemore <sandra@codesourcery.com>
---
libgloss/m68k/io-lseek.c | 2 +-
libgloss/nios2/io-lseek.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgloss/m68k/io-lseek.c b/libgloss/m68k/io-lseek.c
index 63ec564..eaaf557 100644
--- a/libgloss/m68k/io-lseek.c
+++ b/libgloss/m68k/io-lseek.c
@@ -38,7 +38,7 @@ off_t lseek (int fd, off_t offset, int whence)
#if HOSTED
gdb_parambuf_t parameters;
parameters[0] = (uint32_t) fd;
- parameters[1] = (uint32_t) ((offset >> 32) & 0xffffffff);
+ parameters[1] = (uint32_t) ((int64_t)offset >> 32);
parameters[2] = (uint32_t) (offset & 0xffffffff);
parameters[3] = __hosted_to_gdb_lseek_flags (whence);
__hosted (HOSTED_LSEEK, parameters);
diff --git a/libgloss/nios2/io-lseek.c b/libgloss/nios2/io-lseek.c
index bfc23c1..d47fe07 100644
--- a/libgloss/nios2/io-lseek.c
+++ b/libgloss/nios2/io-lseek.c
@@ -39,7 +39,7 @@ off_t lseek (int fd, off_t offset, int whence)
#if HOSTED
gdb_parambuf_t parameters;
parameters[0] = (uint32_t) fd;
- parameters[1] = (uint32_t) ((offset >> 32) & 0xffffffff);
+ parameters[1] = (uint32_t) ((int64_t)offset >> 32);
parameters[2] = (uint32_t) (offset & 0xffffffff);
parameters[3] = __hosted_to_gdb_lseek_flags (whence);
__io_hosted (HOSTED_LSEEK, parameters);
--
2.8.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] libgloss: Fix lseek semihosting bug on nios2 and m68k
2020-02-05 4:34 [PATCH] libgloss: Fix lseek semihosting bug on nios2 and m68k Sandra Loosemore
@ 2020-02-06 10:03 ` Corinna Vinschen
0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2020-02-06 10:03 UTC (permalink / raw)
To: newlib
[-- Attachment #1: Type: text/plain, Size: 1748 bytes --]
On Feb 4 21:34, Sandra Loosemore wrote:
> When off_t is 32 bits, the value needs to be sign-extended to 64 bits
> before shifting right to extract the high-order word. Previously
> negative offsets were incorrectly encoded.
>
> Signed-off-by: Sandra Loosemore <sandra@codesourcery.com>
> ---
> libgloss/m68k/io-lseek.c | 2 +-
> libgloss/nios2/io-lseek.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libgloss/m68k/io-lseek.c b/libgloss/m68k/io-lseek.c
> index 63ec564..eaaf557 100644
> --- a/libgloss/m68k/io-lseek.c
> +++ b/libgloss/m68k/io-lseek.c
> @@ -38,7 +38,7 @@ off_t lseek (int fd, off_t offset, int whence)
> #if HOSTED
> gdb_parambuf_t parameters;
> parameters[0] = (uint32_t) fd;
> - parameters[1] = (uint32_t) ((offset >> 32) & 0xffffffff);
> + parameters[1] = (uint32_t) ((int64_t)offset >> 32);
> parameters[2] = (uint32_t) (offset & 0xffffffff);
> parameters[3] = __hosted_to_gdb_lseek_flags (whence);
> __hosted (HOSTED_LSEEK, parameters);
> diff --git a/libgloss/nios2/io-lseek.c b/libgloss/nios2/io-lseek.c
> index bfc23c1..d47fe07 100644
> --- a/libgloss/nios2/io-lseek.c
> +++ b/libgloss/nios2/io-lseek.c
> @@ -39,7 +39,7 @@ off_t lseek (int fd, off_t offset, int whence)
> #if HOSTED
> gdb_parambuf_t parameters;
> parameters[0] = (uint32_t) fd;
> - parameters[1] = (uint32_t) ((offset >> 32) & 0xffffffff);
> + parameters[1] = (uint32_t) ((int64_t)offset >> 32);
> parameters[2] = (uint32_t) (offset & 0xffffffff);
> parameters[3] = __hosted_to_gdb_lseek_flags (whence);
> __io_hosted (HOSTED_LSEEK, parameters);
> --
> 2.8.1
Pushed.
Thanks,
Corinna
--
Corinna Vinschen
Cygwin Maintainer
Red Hat
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-06 10:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-05 4:34 [PATCH] libgloss: Fix lseek semihosting bug on nios2 and m68k Sandra Loosemore
2020-02-06 10:03 ` Corinna Vinschen
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).