[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4.5 26/29] gdbstub: Remove gdb_do_syscallv
From: |
Richard Henderson |
Subject: |
[PATCH v4.5 26/29] gdbstub: Remove gdb_do_syscallv |
Date: |
Thu, 2 Mar 2023 18:58:02 -0800 |
This function is unused, except to implement gdb_do_syscall.
Fold the implementations together.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/gdbstub/syscalls.h | 11 -----------
gdbstub/syscalls.c | 26 ++++++++++----------------
2 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/include/gdbstub/syscalls.h b/include/gdbstub/syscalls.h
index 5851a2c706..243eaf8ce4 100644
--- a/include/gdbstub/syscalls.h
+++ b/include/gdbstub/syscalls.h
@@ -91,17 +91,6 @@ typedef void (*gdb_syscall_complete_cb)(CPUState *cpu,
uint64_t ret, int err);
*/
void gdb_do_syscall(gdb_syscall_complete_cb cb, const char *fmt, ...);
-/**
- * gdb_do_syscallv:
- * @cb: function to call when the system call has completed
- * @fmt: gdb syscall format string
- * @va: arguments to interpolate into @fmt
- *
- * As gdb_do_syscall, but taking a va_list rather than a variable
- * argument list.
- */
-void gdb_do_syscallv(gdb_syscall_complete_cb cb, const char *fmt, va_list va);
-
/**
* use_gdb_syscalls() - report if GDB should be used for syscalls
*
diff --git a/gdbstub/syscalls.c b/gdbstub/syscalls.c
index 0a48f58d70..af42e244f9 100644
--- a/gdbstub/syscalls.c
+++ b/gdbstub/syscalls.c
@@ -92,24 +92,26 @@ bool gdb_handled_syscall(void)
* %lx - 64-bit argument printed in hex.
* %s - string pointer (target_ulong) and length (int) pair.
*/
-void gdb_do_syscallv(gdb_syscall_complete_cb cb, const char *fmt, va_list va)
+void gdb_do_syscall(gdb_syscall_complete_cb cb, const char *fmt, ...)
{
- char *p;
- char *p_end;
- target_ulong addr;
- uint64_t i64;
+ char *p, *p_end;
+ va_list va;
if (!gdb_attached()) {
return;
}
gdbserver_syscall_state.current_syscall_cb = cb;
+ va_start(va, fmt);
- p = &gdbserver_syscall_state.syscall_buf[0];
- p_end =
&gdbserver_syscall_state.syscall_buf[sizeof(gdbserver_syscall_state.syscall_buf)];
+ p = gdbserver_syscall_state.syscall_buf;
+ p_end = p + sizeof(gdbserver_syscall_state.syscall_buf);
*(p++) = 'F';
while (*fmt) {
if (*fmt == '%') {
+ target_ulong addr;
+ uint64_t i64;
+
fmt++;
switch (*fmt++) {
case 'x':
@@ -140,16 +142,8 @@ void gdb_do_syscallv(gdb_syscall_complete_cb cb, const
char *fmt, va_list va)
}
*p = 0;
- gdb_syscall_handling(gdbserver_syscall_state.syscall_buf);
-}
-
-void gdb_do_syscall(gdb_syscall_complete_cb cb, const char *fmt, ...)
-{
- va_list va;
-
- va_start(va, fmt);
- gdb_do_syscallv(cb, fmt, va);
va_end(va);
+ gdb_syscall_handling(gdbserver_syscall_state.syscall_buf);
}
/*
--
2.34.1
- [PATCH v4.5 19/29] gdbstub: don't use target_ulong while handling registers, (continued)
- [PATCH v4.5 19/29] gdbstub: don't use target_ulong while handling registers, Richard Henderson, 2023/03/02
- [PATCH v4.5 18/29] gdbstub: fix address type of gdb_set_cpu_pc, Richard Henderson, 2023/03/02
- [PATCH v4.5 20/29] gdbstub: move register helpers into standalone include, Richard Henderson, 2023/03/02
- [PATCH v4.5 22/29] gdbstub: only compile gdbstub twice for whole build, Richard Henderson, 2023/03/02
- [PATCH v4.5 21/29] gdbstub: move syscall handling to new file, Richard Henderson, 2023/03/02
- [PATCH v4.5 25/29] gdbstub: split out softmmu/user specifics for syscall handling, Richard Henderson, 2023/03/02
- [PATCH v4.5 27/29] gdbstub: Adjust gdb_do_syscall to only use uint32_t and uint64_t, Richard Henderson, 2023/03/02
- [PATCH v4.5 24/29] include: split target_long definition from cpu-defs, Richard Henderson, 2023/03/02
- [PATCH v4.5 23/29] testing: probe gdb for supported architectures ahead of time, Richard Henderson, 2023/03/02
- [PATCH v4.5 26/29] gdbstub: Remove gdb_do_syscallv,
Richard Henderson <=
- [PATCH v4.5 29/29] gdbstub: move update guest debug to accel ops, Richard Henderson, 2023/03/02
- [PATCH v4.5 28/29] gdbstub: Build syscall.c once, Richard Henderson, 2023/03/02