From: Mark Wielaard <mark@klomp.org>
Date: Sun, 24 Nov 2024 12:28:14 +0000 (+0100)
Subject: coregrind/m_gdbserver/server.h: define memcpy and memset to VG_ variants
X-Git-Tag: VALGRIND_3_25_0~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=579b8a18e025b0398695763953563af0e8384f16;p=thirdparty%2Fvalgrind.git

coregrind/m_gdbserver/server.h: define memcpy and memset to VG_ variants

Then use memset/memcpy in the coregrind/m_gdbserver code instead of
the VG_ variants.
---

diff --git a/coregrind/m_gdbserver/inferiors.c b/coregrind/m_gdbserver/inferiors.c
index 82d8e4af6..fbf7d2359 100644
--- a/coregrind/m_gdbserver/inferiors.c
+++ b/coregrind/m_gdbserver/inferiors.c
@@ -100,7 +100,7 @@ void add_thread (unsigned long thread_id, void *target_data, unsigned int gdb_id
    struct thread_info *new_thread
       = (struct thread_info *) malloc (sizeof (*new_thread));
 
-   VG_(memset) (new_thread, 0, sizeof (*new_thread));
+   memset (new_thread, 0, sizeof (*new_thread));
 
    new_thread->entry.id = thread_id;
 
diff --git a/coregrind/m_gdbserver/remote-utils.c b/coregrind/m_gdbserver/remote-utils.c
index 8dfc768d4..2daf54383 100644
--- a/coregrind/m_gdbserver/remote-utils.c
+++ b/coregrind/m_gdbserver/remote-utils.c
@@ -1137,7 +1137,7 @@ void prepare_resume_reply (char *buf, char status, unsigned char sig)
          CORE_ADDR addr;
          int i;
 
-         VG_(memcpy) (buf, "watch:", 6);
+         memcpy (buf, "watch:", 6);
          buf += 6;
 
          addr = valgrind_stopped_data_address ();
diff --git a/coregrind/m_gdbserver/server.c b/coregrind/m_gdbserver/server.c
index 8ca4de20f..19a360c7a 100644
--- a/coregrind/m_gdbserver/server.c
+++ b/coregrind/m_gdbserver/server.c
@@ -1066,7 +1066,7 @@ void handle_query (char *arg_own_buf, int *new_packet_len_p)
          n = -1;
       else {
          n = strlen(name) - ofs;
-         VG_(memcpy) (data, name, n);
+         memcpy (data, name, n);
       }
 
       if (n < 0)
diff --git a/coregrind/m_gdbserver/server.h b/coregrind/m_gdbserver/server.h
index 06d15fa8c..d6dc8d692 100644
--- a/coregrind/m_gdbserver/server.h
+++ b/coregrind/m_gdbserver/server.h
@@ -162,6 +162,9 @@ extern Int *syscalls_to_catch;
                                VG_(strtoull16) ((s),(r)) \
                                : VG_(strtoull10) ((s),(r)))
 
+#define memcpy(_dd,_ss,_sz)   VG_(memcpy)((_dd),(_ss),(_sz))
+#define memset(_ss,_cc,_sz)   VG_(memset)((_ss),(_cc),(_sz))
+
 #define malloc(sz)            VG_(malloc)  ("gdbsrv", sz)
 #define calloc(n,sz)          VG_(calloc)  ("gdbsrv", n, sz)
 #define realloc(p,size)       VG_(realloc) ("gdbsrv", p, size)