Skip to content

Commit f933b02

Browse files
philmdrth7680
philmd
authored and
rth7680
committed
exec/memory_ldst: Use correct type sizes
Use uint8_t for (unsigned) byte, and uint16_t for (unsigned) 16-bit word. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Message-Id: <[email protected]> Signed-off-by: Richard Henderson <[email protected]>
1 parent e1d2dbe commit f933b02

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎include/exec/memory_ldst.h.inc

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
#ifdef TARGET_ENDIANNESS
23-
extern uint32_t glue(address_space_lduw, SUFFIX)(ARG1_DECL,
23+
extern uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL,
2424
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
2525
extern uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL,
2626
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
@@ -29,17 +29,17 @@ extern uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL,
2929
extern void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL,
3030
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
3131
extern void glue(address_space_stw, SUFFIX)(ARG1_DECL,
32-
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
32+
hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);
3333
extern void glue(address_space_stl, SUFFIX)(ARG1_DECL,
3434
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
3535
extern void glue(address_space_stq, SUFFIX)(ARG1_DECL,
3636
hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);
3737
#else
38-
extern uint32_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
38+
extern uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
3939
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
40-
extern uint32_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL,
40+
extern uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL,
4141
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
42-
extern uint32_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL,
42+
extern uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL,
4343
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
4444
extern uint32_t glue(address_space_ldl_le, SUFFIX)(ARG1_DECL,
4545
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
@@ -50,11 +50,11 @@ extern uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL,
5050
extern uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL,
5151
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
5252
extern void glue(address_space_stb, SUFFIX)(ARG1_DECL,
53-
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
53+
hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result);
5454
extern void glue(address_space_stw_le, SUFFIX)(ARG1_DECL,
55-
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
55+
hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);
5656
extern void glue(address_space_stw_be, SUFFIX)(ARG1_DECL,
57-
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
57+
hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);
5858
extern void glue(address_space_stl_le, SUFFIX)(ARG1_DECL,
5959
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
6060
extern void glue(address_space_stl_be, SUFFIX)(ARG1_DECL,

‎memory_ldst.c.inc

+10-10
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL,
157157
DEVICE_BIG_ENDIAN);
158158
}
159159

160-
uint32_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
160+
uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
161161
hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
162162
{
163163
uint8_t *ptr;
@@ -193,7 +193,7 @@ uint32_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
193193
}
194194

195195
/* warning: addr must be aligned */
196-
static inline uint32_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
196+
static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
197197
hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
198198
enum device_endian endian)
199199
{
@@ -240,21 +240,21 @@ static inline uint32_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
240240
return val;
241241
}
242242

243-
uint32_t glue(address_space_lduw, SUFFIX)(ARG1_DECL,
243+
uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL,
244244
hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
245245
{
246246
return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, result,
247247
DEVICE_NATIVE_ENDIAN);
248248
}
249249

250-
uint32_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL,
250+
uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL,
251251
hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
252252
{
253253
return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, result,
254254
DEVICE_LITTLE_ENDIAN);
255255
}
256256

257-
uint32_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL,
257+
uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL,
258258
hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
259259
{
260260
return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, result,
@@ -366,7 +366,7 @@ void glue(address_space_stl_be, SUFFIX)(ARG1_DECL,
366366
}
367367

368368
void glue(address_space_stb, SUFFIX)(ARG1_DECL,
369-
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
369+
hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result)
370370
{
371371
uint8_t *ptr;
372372
MemoryRegion *mr;
@@ -398,7 +398,7 @@ void glue(address_space_stb, SUFFIX)(ARG1_DECL,
398398

399399
/* warning: addr must be aligned */
400400
static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL,
401-
hwaddr addr, uint32_t val, MemTxAttrs attrs,
401+
hwaddr addr, uint16_t val, MemTxAttrs attrs,
402402
MemTxResult *result, enum device_endian endian)
403403
{
404404
uint8_t *ptr;
@@ -441,21 +441,21 @@ static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL,
441441
}
442442

443443
void glue(address_space_stw, SUFFIX)(ARG1_DECL,
444-
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
444+
hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
445445
{
446446
glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, result,
447447
DEVICE_NATIVE_ENDIAN);
448448
}
449449

450450
void glue(address_space_stw_le, SUFFIX)(ARG1_DECL,
451-
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
451+
hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
452452
{
453453
glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, result,
454454
DEVICE_LITTLE_ENDIAN);
455455
}
456456

457457
void glue(address_space_stw_be, SUFFIX)(ARG1_DECL,
458-
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
458+
hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
459459
{
460460
glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, result,
461461
DEVICE_BIG_ENDIAN);

0 commit comments

Comments
 (0)