public inbox for newlib@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] libgloss: riscv: Fix envp parameter for main
@ 2024-04-11 12:57 Bernd Edlinger
  2024-04-12  9:45 ` Corinna Vinschen
  0 siblings, 1 reply; 2+ messages in thread
From: Bernd Edlinger @ 2024-04-11 12:57 UTC (permalink / raw)
  To: newlib

The envp paramter is currently NULL when crt0.S calls main.
With this patch the envp parameter should now be set correctly.
Tested with riscv32 and riscv64: both gdb/sim and qemu do work.
---
 libgloss/riscv/crt0.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libgloss/riscv/crt0.S b/libgloss/riscv/crt0.S
index f1c5419a5..54443e412 100644
--- a/libgloss/riscv/crt0.S
+++ b/libgloss/riscv/crt0.S
@@ -61,7 +61,9 @@ _start:
 
   lw      a0, 0(sp)                  # a0 = argc
   addi    a1, sp, __SIZEOF_POINTER__ # a1 = argv
-  li      a2, 0                      # a2 = envp = NULL
+  slli    a2, a0, 1 + __SIZEOF_POINTER__ >> 2
+  addi    a2, a2, __SIZEOF_POINTER__
+  add     a2, a2, a1                 # a2 = envp
   call    main
   tail    exit
   .size  _start, .-_start
-- 
2.25.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] libgloss: riscv: Fix envp parameter for main
  2024-04-11 12:57 [PATCH] libgloss: riscv: Fix envp parameter for main Bernd Edlinger
@ 2024-04-12  9:45 ` Corinna Vinschen
  0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2024-04-12  9:45 UTC (permalink / raw)
  To: Bernd Edlinger; +Cc: newlib

On Apr 11 14:57, Bernd Edlinger wrote:
> The envp paramter is currently NULL when crt0.S calls main.
> With this patch the envp parameter should now be set correctly.
> Tested with riscv32 and riscv64: both gdb/sim and qemu do work.
> ---
>  libgloss/riscv/crt0.S | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/libgloss/riscv/crt0.S b/libgloss/riscv/crt0.S
> index f1c5419a5..54443e412 100644
> --- a/libgloss/riscv/crt0.S
> +++ b/libgloss/riscv/crt0.S
> @@ -61,7 +61,9 @@ _start:
>  
>    lw      a0, 0(sp)                  # a0 = argc
>    addi    a1, sp, __SIZEOF_POINTER__ # a1 = argv
> -  li      a2, 0                      # a2 = envp = NULL
> +  slli    a2, a0, 1 + __SIZEOF_POINTER__ >> 2
> +  addi    a2, a2, __SIZEOF_POINTER__
> +  add     a2, a2, a1                 # a2 = envp
>    call    main
>    tail    exit
>    .size  _start, .-_start
> -- 
> 2.25.1

Pushed.

Thanks,
Corinna


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-04-12  9:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-11 12:57 [PATCH] libgloss: riscv: Fix envp parameter for main Bernd Edlinger
2024-04-12  9:45 ` 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).