From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Cc: aburgess@redhat.comy
Subject: [PATCH 2/3] sim: constify various integer readers
Date: Wed, 26 Oct 2022 23:01:39 +0545 [thread overview]
Message-ID: <20221026171640.31628-2-vapier@gentoo.org> (raw)
In-Reply-To: <20221026171640.31628-1-vapier@gentoo.org>
These functions only read from memory, so mark the pointer as const.
---
sim/aarch64/interp.c | 2 +-
sim/arm/iwmmxt.c | 2 +-
sim/arm/iwmmxt.h | 2 +-
sim/arm/wrapper.c | 2 +-
sim/bfin/machs.c | 2 +-
sim/cr16/interp.c | 2 +-
sim/d10v/d10v_sim.h | 6 +++---
sim/d10v/endian.c | 6 +++---
sim/ft32/interp.c | 2 +-
sim/m32c/gdb-if.c | 2 +-
sim/mcore/interp.c | 2 +-
sim/microblaze/interp.c | 2 +-
sim/moxie/interp.c | 2 +-
sim/pru/interp.c | 8 ++++----
sim/rl78/gdb-if.c | 2 +-
sim/rx/gdb-if.c | 4 ++--
16 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/sim/aarch64/interp.c b/sim/aarch64/interp.c
index a04f1dcc389c..ac95c7dfaac7 100644
--- a/sim/aarch64/interp.c
+++ b/sim/aarch64/interp.c
@@ -171,7 +171,7 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
/* Read the LENGTH bytes at BUF as a little-endian value. */
static bfd_vma
-get_le (unsigned char *buf, unsigned int length)
+get_le (const unsigned char *buf, unsigned int length)
{
bfd_vma acc = 0;
diff --git a/sim/arm/iwmmxt.c b/sim/arm/iwmmxt.c
index 5f91012bc2a9..ad065317b410 100644
--- a/sim/arm/iwmmxt.c
+++ b/sim/arm/iwmmxt.c
@@ -3723,7 +3723,7 @@ Fetch_Iwmmxt_Register (unsigned int regnum, unsigned char * memory)
}
int
-Store_Iwmmxt_Register (unsigned int regnum, unsigned char * memory)
+Store_Iwmmxt_Register (unsigned int regnum, const unsigned char * memory)
{
if (regnum >= 16)
{
diff --git a/sim/arm/iwmmxt.h b/sim/arm/iwmmxt.h
index e49a8d78d09b..2f677affa318 100644
--- a/sim/arm/iwmmxt.h
+++ b/sim/arm/iwmmxt.h
@@ -24,4 +24,4 @@ extern unsigned IwmmxtCDP (ARMul_State *, unsigned, ARMword);
extern int ARMul_HandleIwmmxt (ARMul_State *, ARMword);
extern int Fetch_Iwmmxt_Register (unsigned int, unsigned char *);
-extern int Store_Iwmmxt_Register (unsigned int, unsigned char *);
+extern int Store_Iwmmxt_Register (unsigned int, const unsigned char *);
diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 38a1f27a3b01..72a65242b9dd 100644
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -397,7 +397,7 @@ sim_create_inferior (SIM_DESC sd ATTRIBUTE_UNUSED,
}
static int
-frommem (struct ARMul_State *state, unsigned char *memory)
+frommem (struct ARMul_State *state, const unsigned char *memory)
{
if (state->bigendSig == HIGH)
return (memory[0] << 24) | (memory[1] << 16)
diff --git a/sim/bfin/machs.c b/sim/bfin/machs.c
index 2d3a019b9bab..f322b183b2e2 100644
--- a/sim/bfin/machs.c
+++ b/sim/bfin/machs.c
@@ -1758,7 +1758,7 @@ bfin_model_init (SIM_CPU *cpu)
}
static bu32
-bfin_extract_unsigned_integer (unsigned char *addr, int len)
+bfin_extract_unsigned_integer (const unsigned char *addr, int len)
{
bu32 retval;
unsigned char * p;
diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index b375dadff5d6..cbdcdc6e7932 100644
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -690,7 +690,7 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
}
static uint32_t
-cr16_extract_unsigned_integer (unsigned char *addr, int len)
+cr16_extract_unsigned_integer (const unsigned char *addr, int len)
{
uint32_t retval;
unsigned char * p;
diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v_sim.h
index 7b354fd48414..e78ea2fe9df8 100644
--- a/sim/d10v/d10v_sim.h
+++ b/sim/d10v/d10v_sim.h
@@ -445,9 +445,9 @@ extern uint8_t *imem_addr (SIM_DESC, SIM_CPU *, uint32_t);
#undef ENDIAN_INLINE
#else
-extern uint32_t get_longword (uint8_t *);
-extern uint16_t get_word (uint8_t *);
-extern int64_t get_longlong (uint8_t *);
+extern uint32_t get_longword (const uint8_t *);
+extern uint16_t get_word (const uint8_t *);
+extern int64_t get_longlong (const uint8_t *);
extern void write_word (uint8_t *addr, uint16_t data);
extern void write_longword (uint8_t *addr, uint32_t data);
extern void write_longlong (uint8_t *addr, int64_t data);
diff --git a/sim/d10v/endian.c b/sim/d10v/endian.c
index f3e1e46214f7..44e80e6d6530 100644
--- a/sim/d10v/endian.c
+++ b/sim/d10v/endian.c
@@ -11,19 +11,19 @@
#endif
ENDIAN_INLINE uint16_t
-get_word (uint8_t *x)
+get_word (const uint8_t *x)
{
return ((uint16_t)x[0]<<8) + x[1];
}
ENDIAN_INLINE uint32_t
-get_longword (uint8_t *x)
+get_longword (const uint8_t *x)
{
return ((uint32_t)x[0]<<24) + ((uint32_t)x[1]<<16) + ((uint32_t)x[2]<<8) + ((uint32_t)x[3]);
}
ENDIAN_INLINE int64_t
-get_longlong (uint8_t *x)
+get_longlong (const uint8_t *x)
{
uint32_t top = get_longword (x);
uint32_t bottom = get_longword (x+4);
diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c
index 8e828e68effb..70212f45cca3 100644
--- a/sim/ft32/interp.c
+++ b/sim/ft32/interp.c
@@ -56,7 +56,7 @@
#define RAM_BIAS 0x800000 /* Bias added to RAM addresses. */
static unsigned long
-ft32_extract_unsigned_integer (unsigned char *addr, int len)
+ft32_extract_unsigned_integer (const unsigned char *addr, int len)
{
unsigned long retval;
unsigned char *p;
diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c
index 8bb8e9bb5636..802eae978518 100644
--- a/sim/m32c/gdb-if.c
+++ b/sim/m32c/gdb-if.c
@@ -184,7 +184,7 @@ sim_write (SIM_DESC sd, SIM_ADDR mem, const void *buf, int length)
/* Read the LENGTH bytes at BUF as an little-endian value. */
static DI
-get_le (unsigned char *buf, int length)
+get_le (const unsigned char *buf, int length)
{
DI acc = 0;
while (--length >= 0)
diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c
index dbac1567ffb0..082bc4e07677 100644
--- a/sim/mcore/interp.c
+++ b/sim/mcore/interp.c
@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
static unsigned long
-mcore_extract_unsigned_integer (unsigned char *addr, int len)
+mcore_extract_unsigned_integer (const unsigned char *addr, int len)
{
unsigned long retval;
unsigned char * p;
diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c
index 2ec223868a74..6aa02632093a 100644
--- a/sim/microblaze/interp.c
+++ b/sim/microblaze/interp.c
@@ -38,7 +38,7 @@
#define target_big_endian (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
static unsigned long
-microblaze_extract_unsigned_integer (unsigned char *addr, int len)
+microblaze_extract_unsigned_integer (const unsigned char *addr, int len)
{
unsigned long retval;
unsigned char *p;
diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index a08dc694553a..d5d14bfe49d9 100644
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -57,7 +57,7 @@ typedef unsigned int uword;
+ (sim_core_read_aligned_1 (scpu, cia, read_map, addr+1))) << 16) >> 16)
static unsigned long
-moxie_extract_unsigned_integer (unsigned char *addr, int len)
+moxie_extract_unsigned_integer (const unsigned char *addr, int len)
{
unsigned long retval;
unsigned char * p;
diff --git a/sim/pru/interp.c b/sim/pru/interp.c
index a62b5a2c8fe2..fabedc99f6e2 100644
--- a/sim/pru/interp.c
+++ b/sim/pru/interp.c
@@ -45,12 +45,12 @@ enum {
/* Extract (from PRU endianess) and return an integer in HOST's endianness. */
static uint32_t
-pru_extract_unsigned_integer (uint8_t *addr, size_t len)
+pru_extract_unsigned_integer (const uint8_t *addr, size_t len)
{
uint32_t retval;
- uint8_t *p;
- uint8_t *startaddr = addr;
- uint8_t *endaddr = startaddr + len;
+ const uint8_t *p;
+ const uint8_t *startaddr = addr;
+ const uint8_t *endaddr = startaddr + len;
/* Start at the most significant end of the integer, and work towards
the least significant. */
diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c
index 8129c0924dc9..98bb0a4044b2 100644
--- a/sim/rl78/gdb-if.c
+++ b/sim/rl78/gdb-if.c
@@ -237,7 +237,7 @@ sim_write (SIM_DESC sd, SIM_ADDR mem, const void *buf, int length)
/* Read the LENGTH bytes at BUF as an little-endian value. */
static SI
-get_le (unsigned char *buf, int length)
+get_le (const unsigned char *buf, int length)
{
SI acc = 0;
diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c
index c116bdcf608b..7af37b94fcf1 100644
--- a/sim/rx/gdb-if.c
+++ b/sim/rx/gdb-if.c
@@ -276,7 +276,7 @@ sim_write (SIM_DESC sd, SIM_ADDR mem, const void *buffer, int length)
/* Read the LENGTH bytes at BUF as an little-endian value. */
static DI
-get_le (unsigned char *buf, int length)
+get_le (const unsigned char *buf, int length)
{
DI acc = 0;
while (--length >= 0)
@@ -287,7 +287,7 @@ get_le (unsigned char *buf, int length)
/* Read the LENGTH bytes at BUF as a big-endian value. */
static DI
-get_be (unsigned char *buf, int length)
+get_be (const unsigned char *buf, int length)
{
DI acc = 0;
while (length-- > 0)
--
2.37.3
next prev parent reply other threads:[~2022-10-26 18:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 17:16 [PATCH 1/3] sim: cgen: constify GETT helpers Mike Frysinger
2022-10-26 17:16 ` Mike Frysinger [this message]
2022-10-26 17:16 ` [PATCH 3/3] sim: reg: constify store helper Mike Frysinger
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=20221026171640.31628-2-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=aburgess@redhat.comy \
--cc=gdb-patches@sourceware.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 read-only IMAP folder(s) and NNTP newsgroup(s).