From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Roman Kiryanov <rkir@google.com>,
richard.henderson@linaro.org, qemu-devel@nongnu.org
Cc: jansene@google.com, mett@google.com, jpcottin@google.com
Subject: Re: [PATCH v2] exec: use char* for pointer arithmetic
Date: Fri, 21 Jun 2024 08:36:43 +0200 [thread overview]
Message-ID: <2c1c5bfa-da3f-4f09-b7d7-832bcc399be2@linaro.org> (raw)
In-Reply-To: <20240619000450.893463-1-rkir@google.com>
On 19/6/24 02:04, Roman Kiryanov wrote:
> void* pointer arithmetic is not in the
> C standard. This change allows using
> the QEMU headers with a C++ compiler.
>
> Google-Bug-Id: 331190993
> Change-Id: I5a064853429f627c17a9213910811dea4ced6174
> Signed-off-by: Roman Kiryanov <rkir@google.com>
> ---
> v2: change `char*` into `char *` (add the missing space).
>
> include/exec/memory.h | 8 ++++----
> include/exec/memory_ldst_cached.h.inc | 12 ++++++------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index d7591a60d9..a6d64e39a5 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -2839,7 +2839,7 @@ static inline uint8_t address_space_ldub_cached(MemoryRegionCache *cache,
> {
> assert(addr < cache->len);
> if (likely(cache->ptr)) {
> - return ldub_p(cache->ptr + addr);
> + return ldub_p((char *)cache->ptr + addr);
> } else {
> return address_space_ldub_cached_slow(cache, addr, attrs, result);
> }
> @@ -2850,7 +2850,7 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache,
> {
> assert(addr < cache->len);
> if (likely(cache->ptr)) {
> - stb_p(cache->ptr + addr, val);
> + stb_p((char *)cache->ptr + addr, val);
> } else {
> address_space_stb_cached_slow(cache, addr, val, attrs, result);
> }
> @@ -3123,7 +3123,7 @@ address_space_read_cached(MemoryRegionCache *cache, hwaddr addr,
> assert(addr < cache->len && len <= cache->len - addr);
> fuzz_dma_read_cb(cache->xlat + addr, len, cache->mrs.mr);
> if (likely(cache->ptr)) {
> - memcpy(buf, cache->ptr + addr, len);
> + memcpy(buf, (char *)cache->ptr + addr, len);
> return MEMTX_OK;
> } else {
> return address_space_read_cached_slow(cache, addr, buf, len);
> @@ -3144,7 +3144,7 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr,
> {
> assert(addr < cache->len && len <= cache->len - addr);
> if (likely(cache->ptr)) {
> - memcpy(cache->ptr + addr, buf, len);
> + memcpy((char *)cache->ptr + addr, buf, len);
> return MEMTX_OK;
> } else {
> return address_space_write_cached_slow(cache, addr, buf, len);
> diff --git a/include/exec/memory_ldst_cached.h.inc b/include/exec/memory_ldst_cached.h.inc
> index d7834f852c..9426663524 100644
> --- a/include/exec/memory_ldst_cached.h.inc
> +++ b/include/exec/memory_ldst_cached.h.inc
> @@ -30,7 +30,7 @@ static inline uint16_t ADDRESS_SPACE_LD_CACHED(uw)(MemoryRegionCache *cache,
> assert(addr < cache->len && 2 <= cache->len - addr);
> fuzz_dma_read_cb(cache->xlat + addr, 2, cache->mrs.mr);
> if (likely(cache->ptr)) {
> - return LD_P(uw)(cache->ptr + addr);
> + return LD_P(uw)((char *)cache->ptr + addr);
> } else {
> return ADDRESS_SPACE_LD_CACHED_SLOW(uw)(cache, addr, attrs, result);
> }
> @@ -42,7 +42,7 @@ static inline uint32_t ADDRESS_SPACE_LD_CACHED(l)(MemoryRegionCache *cache,
> assert(addr < cache->len && 4 <= cache->len - addr);
> fuzz_dma_read_cb(cache->xlat + addr, 4, cache->mrs.mr);
> if (likely(cache->ptr)) {
> - return LD_P(l)(cache->ptr + addr);
> + return LD_P(l)((char *)cache->ptr + addr);
> } else {
> return ADDRESS_SPACE_LD_CACHED_SLOW(l)(cache, addr, attrs, result);
> }
> @@ -54,7 +54,7 @@ static inline uint64_t ADDRESS_SPACE_LD_CACHED(q)(MemoryRegionCache *cache,
> assert(addr < cache->len && 8 <= cache->len - addr);
> fuzz_dma_read_cb(cache->xlat + addr, 8, cache->mrs.mr);
> if (likely(cache->ptr)) {
> - return LD_P(q)(cache->ptr + addr);
> + return LD_P(q)((char *)cache->ptr + addr);
> } else {
> return ADDRESS_SPACE_LD_CACHED_SLOW(q)(cache, addr, attrs, result);
> }
> @@ -76,7 +76,7 @@ static inline void ADDRESS_SPACE_ST_CACHED(w)(MemoryRegionCache *cache,
> {
> assert(addr < cache->len && 2 <= cache->len - addr);
> if (likely(cache->ptr)) {
> - ST_P(w)(cache->ptr + addr, val);
> + ST_P(w)((char *)cache->ptr + addr, val);
> } else {
> ADDRESS_SPACE_ST_CACHED_SLOW(w)(cache, addr, val, attrs, result);
> }
> @@ -87,7 +87,7 @@ static inline void ADDRESS_SPACE_ST_CACHED(l)(MemoryRegionCache *cache,
> {
> assert(addr < cache->len && 4 <= cache->len - addr);
> if (likely(cache->ptr)) {
> - ST_P(l)(cache->ptr + addr, val);
> + ST_P(l)((char *)cache->ptr + addr, val);
> } else {
> ADDRESS_SPACE_ST_CACHED_SLOW(l)(cache, addr, val, attrs, result);
> }
> @@ -98,7 +98,7 @@ static inline void ADDRESS_SPACE_ST_CACHED(q)(MemoryRegionCache *cache,
> {
> assert(addr < cache->len && 8 <= cache->len - addr);
> if (likely(cache->ptr)) {
> - ST_P(q)(cache->ptr + addr, val);
> + ST_P(q)((char *)cache->ptr + addr, val);
> } else {
> ADDRESS_SPACE_ST_CACHED_SLOW(q)(cache, addr, val, attrs, result);
> }
Superseded by
https://lore.kernel.org/qemu-devel/20240620201654.598024-1-rkir@google.com/.
prev parent reply other threads:[~2024-06-21 6:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-19 0:04 [PATCH v2] exec: use char* for pointer arithmetic Roman Kiryanov
2024-06-19 2:40 ` Richard Henderson
2024-06-21 6:36 ` Philippe Mathieu-Daudé [this message]
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=2c1c5bfa-da3f-4f09-b7d7-832bcc399be2@linaro.org \
--to=philmd@linaro.org \
--cc=jansene@google.com \
--cc=jpcottin@google.com \
--cc=mett@google.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=rkir@google.com \
/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).