qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 58/60] target/mips: Drop pread and pwrite syscalls from semihosting
Date: Tue, 28 Jun 2022 10:24:01 +0530	[thread overview]
Message-ID: <20220628045403.508716-59-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220628045403.508716-1-richard.henderson@linaro.org>

We don't implement it with _WIN32 hosts, and the syscalls
are missing from the gdb remote file i/o interface.
Since we can't implement them universally, drop them.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/mips/tcg/sysemu/mips-semi.c | 39 ++++++------------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/target/mips/tcg/sysemu/mips-semi.c b/target/mips/tcg/sysemu/mips-semi.c
index 2a039baf4c..67c35fe7f9 100644
--- a/target/mips/tcg/sysemu/mips-semi.c
+++ b/target/mips/tcg/sysemu/mips-semi.c
@@ -182,8 +182,8 @@ static int get_open_flags(target_ulong target_flags)
     return open_flags;
 }
 
-static int write_to_file(CPUMIPSState *env, target_ulong fd, target_ulong vaddr,
-                         target_ulong len, target_ulong offset)
+static int write_to_file(CPUMIPSState *env, target_ulong fd,
+                         target_ulong vaddr, target_ulong len)
 {
     int num_of_bytes;
     void *dst = lock_user(VERIFY_READ, vaddr, len, 1);
@@ -192,23 +192,14 @@ static int write_to_file(CPUMIPSState *env, target_ulong fd, target_ulong vaddr,
         return -1;
     }
 
-    if (offset) {
-#ifdef _WIN32
-        num_of_bytes = 0;
-#else
-        num_of_bytes = pwrite(fd, dst, len, offset);
-#endif
-    } else {
-        num_of_bytes = write(fd, dst, len);
-    }
+    num_of_bytes = write(fd, dst, len);
 
     unlock_user(dst, vaddr, 0);
     return num_of_bytes;
 }
 
 static int read_from_file(CPUMIPSState *env, target_ulong fd,
-                          target_ulong vaddr, target_ulong len,
-                          target_ulong offset)
+                          target_ulong vaddr, target_ulong len)
 {
     int num_of_bytes;
     void *dst = lock_user(VERIFY_WRITE, vaddr, len, 0);
@@ -217,15 +208,7 @@ static int read_from_file(CPUMIPSState *env, target_ulong fd,
         return -1;
     }
 
-    if (offset) {
-#ifdef _WIN32
-        num_of_bytes = 0;
-#else
-        num_of_bytes = pread(fd, dst, len, offset);
-#endif
-    } else {
-        num_of_bytes = read(fd, dst, len);
-    }
+    num_of_bytes = read(fd, dst, len);
 
     unlock_user(dst, vaddr, len);
     return num_of_bytes;
@@ -312,11 +295,11 @@ void mips_semihosting(CPUMIPSState *env)
         gpr[3] = errno_mips(errno);
         break;
     case UHI_read:
-        gpr[2] = read_from_file(env, gpr[4], gpr[5], gpr[6], 0);
+        gpr[2] = read_from_file(env, gpr[4], gpr[5], gpr[6]);
         gpr[3] = errno_mips(errno);
         break;
     case UHI_write:
-        gpr[2] = write_to_file(env, gpr[4], gpr[5], gpr[6], 0);
+        gpr[2] = write_to_file(env, gpr[4], gpr[5], gpr[6]);
         gpr[3] = errno_mips(errno);
         break;
     case UHI_lseek:
@@ -382,14 +365,6 @@ void mips_semihosting(CPUMIPSState *env)
         FREE_TARGET_STRING(p, gpr[4]);
         abort();
         break;
-    case UHI_pread:
-        gpr[2] = read_from_file(env, gpr[4], gpr[5], gpr[6], gpr[7]);
-        gpr[3] = errno_mips(errno);
-        break;
-    case UHI_pwrite:
-        gpr[2] = write_to_file(env, gpr[4], gpr[5], gpr[6], gpr[7]);
-        gpr[3] = errno_mips(errno);
-        break;
 #ifndef _WIN32
     case UHI_link:
         GET_TARGET_STRINGS_2(p, gpr[4], p2, gpr[5]);
-- 
2.34.1



  parent reply	other threads:[~2022-06-28  7:22 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-28  4:53 [PULL 00/60] semihosting patch queue Richard Henderson
2022-06-28  4:53 ` [PULL 01/60] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h Richard Henderson
2022-06-28  4:53 ` [PULL 02/60] semihosting: Return failure from softmmu-uaccess.h functions Richard Henderson
2022-07-29 14:31   ` Peter Maydell
2022-07-29 15:53     ` Richard Henderson
2024-01-29  9:49   ` Philippe Mathieu-Daudé
2022-06-28  4:53 ` [PULL 03/60] semihosting: Improve condition for config.c and console.c Richard Henderson
2022-06-28  4:53 ` [PULL 04/60] semihosting: Move softmmu-uaccess.h functions out of line Richard Henderson
2022-06-28  4:53 ` [PULL 05/60] accel/stubs: Add tcg stub for probe_access_flags Richard Henderson
2022-06-28  4:53 ` [PULL 06/60] semihosting: Add target_strlen for softmmu-uaccess.h Richard Henderson
2022-06-28  4:53 ` [PULL 07/60] semihosting: Simplify softmmu_lock_user_string Richard Henderson
2022-06-28  4:53 ` [PULL 08/60] semihosting: Split out guestfd.c Richard Henderson
2022-06-28  4:53 ` [PULL 09/60] semihosting: Inline set_swi_errno into common_semi_cb Richard Henderson
2022-06-28  4:53 ` [PULL 10/60] semihosting: Adjust error checking in common_semi_cb Richard Henderson
2022-06-28  4:53 ` [PULL 11/60] semihosting: Clean up common_semi_flen_cb Richard Henderson
2022-06-28  4:53 ` [PULL 12/60] semihosting: Clean up common_semi_open_cb Richard Henderson
2022-06-28  4:53 ` [PULL 13/60] semihosting: Return void from do_common_semihosting Richard Henderson
2022-06-28  4:53 ` [PULL 14/60] semihosting: Move common-semi.h to include/semihosting/ Richard Henderson
2022-06-28  4:53 ` [PULL 15/60] semihosting: Remove GDB_O_BINARY Richard Henderson
2022-06-28  4:53 ` [PULL 16/60] include/exec: Move gdb open flags to gdbstub.h Richard Henderson
2022-06-28  4:53 ` [PULL 17/60] include/exec: Move gdb_stat and gdb_timeval " Richard Henderson
2022-06-28  4:53 ` [PULL 18/60] include/exec: Define errno values in gdbstub.h Richard Henderson
2022-06-28  4:53 ` [PULL 19/60] gdbstub: Convert GDB error numbers to host error numbers Richard Henderson
2022-06-28  4:53 ` [PULL 20/60] semihosting: Use struct gdb_stat in common_semi_flen_cb Richard Henderson
2022-06-28  4:53 ` [PULL 21/60] semihosting: Split is_64bit_semihosting per target Richard Henderson
2022-06-28  4:53 ` [PULL 22/60] semihosting: Split common_semi_flen_buf " Richard Henderson
2022-06-28  4:53 ` [PULL 23/60] semihosting: Split out common_semi_has_synccache Richard Henderson
2022-06-28  4:53 ` [PULL 24/60] semihosting: Split out common-semi-target.h Richard Henderson
2022-06-28  4:53 ` [PULL 25/60] semihosting: Use env more often in do_common_semihosting Richard Henderson
2022-06-28  4:53 ` [PULL 26/60] semihosting: Move GET_ARG/SET_ARG earlier in the file Richard Henderson
2022-06-28  4:53 ` [PULL 27/60] semihosting: Split out semihost_sys_open Richard Henderson
2022-06-28  4:53 ` [PULL 28/60] semihosting: Split out semihost_sys_close Richard Henderson
2022-06-28  4:53 ` [PULL 29/60] semihosting: Split out semihost_sys_read Richard Henderson
2022-06-28  4:53 ` [PULL 30/60] semihosting: Split out semihost_sys_write Richard Henderson
2022-06-28  4:53 ` [PULL 31/60] semihosting: Bound length for semihost_sys_{read,write} Richard Henderson
2022-06-28  4:53 ` [PULL 32/60] semihosting: Split out semihost_sys_lseek Richard Henderson
2022-06-28  4:53 ` [PULL 33/60] semihosting: Split out semihost_sys_isatty Richard Henderson
2022-06-28  4:53 ` [PULL 34/60] semihosting: Split out semihost_sys_flen Richard Henderson
2022-06-28  4:53 ` [PULL 35/60] semihosting: Split out semihost_sys_remove Richard Henderson
2022-06-28  4:53 ` [PULL 36/60] semihosting: Split out semihost_sys_rename Richard Henderson
2022-06-28  4:53 ` [PULL 37/60] semihosting: Split out semihost_sys_system Richard Henderson
2022-06-28  4:53 ` [PULL 38/60] semihosting: Create semihost_sys_{stat,fstat} Richard Henderson
2022-06-28  4:53 ` [PULL 39/60] semihosting: Create semihost_sys_gettimeofday Richard Henderson
2022-06-28  4:53 ` [PULL 40/60] gdbstub: Adjust gdb_syscall_complete_cb declaration Richard Henderson
2022-06-28  4:53 ` [PULL 41/60] semihosting: Fix docs comment for qemu_semihosting_console_inc Richard Henderson
2022-06-28  4:53 ` [PULL 42/60] semihosting: Pass CPUState to qemu_semihosting_console_inc Richard Henderson
2022-06-28  4:53 ` [PULL 43/60] semihosting: Expand qemu_semihosting_console_inc to read Richard Henderson
2022-06-28  4:53 ` [PULL 44/60] semihosting: Cleanup chardev init Richard Henderson
2022-06-28  4:53 ` [PULL 45/60] semihosting: Create qemu_semihosting_console_write Richard Henderson
2022-06-28  4:53 ` [PULL 46/60] semihosting: Add GuestFDConsole Richard Henderson
2022-06-28  4:53 ` [PULL 47/60] semihosting: Create qemu_semihosting_guestfd_init Richard Henderson
2022-06-28  4:53 ` [PULL 48/60] semihosting: Use console_in_gf for SYS_READC Richard Henderson
2022-06-28  4:53 ` [PULL 49/60] semihosting: Use console_out_gf for SYS_WRITEC Richard Henderson
2022-06-28  4:53 ` [PULL 50/60] semihosting: Remove qemu_semihosting_console_outc Richard Henderson
2022-06-28  4:53 ` [PULL 51/60] semihosting: Use console_out_gf for SYS_WRITE0 Richard Henderson
2022-06-28  4:53 ` [PULL 52/60] semihosting: Remove qemu_semihosting_console_outs Richard Henderson
2022-06-28  4:53 ` [PULL 53/60] semihosting: Create semihost_sys_poll_one Richard Henderson
2022-06-28  4:53 ` [PULL 54/60] target/m68k: Eliminate m68k_semi_is_fseek Richard Henderson
2022-06-28  4:53 ` [PULL 55/60] target/m68k: Make semihosting system only Richard Henderson
2022-06-28  4:53 ` [PULL 56/60] target/mips: Use an exception for semihosting Richard Henderson
2022-06-28  4:54 ` [PULL 57/60] target/mips: Add UHI errno values Richard Henderson
2022-06-28  4:54 ` Richard Henderson [this message]
2022-06-28  4:54 ` [PULL 59/60] target/nios2: Eliminate nios2_semi_is_lseek Richard Henderson
2022-06-28  4:54 ` [PULL 60/60] target/nios2: Move nios2-semi.c to nios2_softmmu_ss Richard Henderson
2022-06-28  6:20 ` [PULL 00/60] semihosting patch queue Richard Henderson

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=20220628045403.508716-59-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=f4bug@amsat.org \
    --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).