qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Daniil Kovalev <dkovalev@compiler-toolchain-for.me>,
	Jiaxun Yang <jiaxun.yang@flygoat.com>,
	Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 8/9] linux-user: Fix mips fp64 executables loading
Date: Wed, 17 May 2023 10:01:51 +0200	[thread overview]
Message-ID: <20230517080152.108660-9-laurent@vivier.eu> (raw)
In-Reply-To: <20230517080152.108660-1-laurent@vivier.eu>

From: Daniil Kovalev <dkovalev@compiler-toolchain-for.me>

If a program requires fr1, we should set the FR bit of CP0 control status
register and add F64 hardware flag. The corresponding `else if` branch
statement is copied from the linux kernel sources (see `arch_check_elf` function
in linux/arch/mips/kernel/elf.c).

Signed-off-by: Daniil Kovalev <dkovalev@compiler-toolchain-for.me>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <20230404052153.16617-1-dkovalev@compiler-toolchain-for.me>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/mips/cpu_loop.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
index d5c1c7941d34..8735e58bada0 100644
--- a/linux-user/mips/cpu_loop.c
+++ b/linux-user/mips/cpu_loop.c
@@ -290,7 +290,10 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
             env->CP0_Status |= (1 << CP0St_FR);
             env->hflags |= MIPS_HFLAG_F64;
         }
-    } else  if (!prog_req.fre && !prog_req.frdefault &&
+    } else if (prog_req.fr1) {
+        env->CP0_Status |= (1 << CP0St_FR);
+        env->hflags |= MIPS_HFLAG_F64;
+    } else if (!prog_req.fre && !prog_req.frdefault &&
           !prog_req.fr1 && !prog_req.single && !prog_req.soft) {
         fprintf(stderr, "qemu: Can't find a matching FPU mode\n");
         exit(1);
-- 
2.40.1



  parent reply	other threads:[~2023-05-17  8:11 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-17  8:01 [PULL 0/9] Linux user for 8.1 patches Laurent Vivier
2023-05-17  8:01 ` [PULL 1/9] linux-user: Emulate /proc/cpuinfo output for riscv Laurent Vivier
2023-05-17  8:01 ` [PULL 2/9] linux-user: report ENOTTY for unknown ioctls Laurent Vivier
2023-05-17  8:01 ` [PULL 3/9] linux-user: Add move_mount() syscall Laurent Vivier
2023-05-17  8:01 ` [PULL 4/9] linux-user: Add open_tree() syscall Laurent Vivier
2023-05-17  8:01 ` [PULL 5/9] linux-user/main: Use list_cpus() instead of cpu_list() Laurent Vivier
2023-05-17  8:01 ` [PULL 6/9] linux-user: Add new flag VERIFY_NONE Laurent Vivier
2023-05-17  8:01 ` [PULL 7/9] linux-user: Don't require PROT_READ for mincore Laurent Vivier
2023-05-17  8:01 ` Laurent Vivier [this message]
2023-05-17  8:01 ` [PULL 9/9] linux-user: fix getgroups/setgroups allocations Laurent Vivier
2023-05-17 16:04 ` [PULL 0/9] Linux user for 8.1 patches Richard Henderson
  -- strict thread matches above, loose matches on Subject: below --
2023-05-16 12:48 Laurent Vivier
2023-05-16 12:48 ` [PULL 8/9] linux-user: Fix mips fp64 executables loading Laurent Vivier
2023-05-15  8:31 [PULL 0/9] Linux user for 8.1 patches Laurent Vivier
2023-05-15  8:31 ` [PULL 8/9] linux-user: Fix mips fp64 executables loading Laurent Vivier
2023-05-12 11:22 [PULL 0/9] Linux user for 8.1 patches Laurent Vivier
2023-05-12 11:22 ` [PULL 8/9] linux-user: Fix mips fp64 executables loading Laurent Vivier

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=20230517080152.108660-9-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=dkovalev@compiler-toolchain-for.me \
    --cc=jiaxun.yang@flygoat.com \
    --cc=qemu-devel@nongnu.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 NNTP newsgroup(s).