[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] hw/net/eepro100.c: Don't use cpu_to_*w() and *_
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 1/5] hw/net/eepro100.c: Don't use cpu_to_*w() and *_to_cpup() |
Date: |
Thu, 16 Jun 2016 18:17:22 +0100 |
Don't use cpu_to_*w() and *_to_cpup() to do byte-swapped loads
and stores; instead use ld*_p() and st*_p() which correctly handle
misaligned accesses.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/net/eepro100.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 9b4b9b5..b10c419 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -352,14 +352,14 @@ static unsigned e100_compute_mcast_idx(const uint8_t *ep)
static uint16_t e100_read_reg2(EEPRO100State *s, E100RegisterOffset addr)
{
assert(!((uintptr_t)&s->mem[addr] & 1));
- return le16_to_cpup((uint16_t *)&s->mem[addr]);
+ return lduw_le_p(&s->mem[addr]);
}
/* Read a 32 bit control/status (CSR) register. */
static uint32_t e100_read_reg4(EEPRO100State *s, E100RegisterOffset addr)
{
assert(!((uintptr_t)&s->mem[addr] & 3));
- return le32_to_cpup((uint32_t *)&s->mem[addr]);
+ return ldl_le_p(&s->mem[addr]);
}
/* Write a 16 bit control/status (CSR) register. */
@@ -367,7 +367,7 @@ static void e100_write_reg2(EEPRO100State *s,
E100RegisterOffset addr,
uint16_t val)
{
assert(!((uintptr_t)&s->mem[addr] & 1));
- cpu_to_le16w((uint16_t *)&s->mem[addr], val);
+ stw_le_p(&s->mem[addr], val);
}
/* Read a 32 bit control/status (CSR) register. */
@@ -375,7 +375,7 @@ static void e100_write_reg4(EEPRO100State *s,
E100RegisterOffset addr,
uint32_t val)
{
assert(!((uintptr_t)&s->mem[addr] & 3));
- cpu_to_le32w((uint32_t *)&s->mem[addr], val);
+ stl_le_p(&s->mem[addr], val);
}
#if defined(DEBUG_EEPRO100)
--
1.9.1
- [Qemu-devel] [PATCH 0/5] hw/net: Don't use cpu_to_*w() and *_to_cpup(), Peter Maydell, 2016/06/16
- [Qemu-devel] [PATCH 2/5] hw/net/rtl8139.c: Don't use *_to_cpup(), Peter Maydell, 2016/06/16
- [Qemu-devel] [PATCH 1/5] hw/net/eepro100.c: Don't use cpu_to_*w() and *_to_cpup(),
Peter Maydell <=
- [Qemu-devel] [PATCH 4/5] hw/net/virtio-net.c: Don't use *_to_cpup(), Peter Maydell, 2016/06/16
- [Qemu-devel] [PATCH 3/5] hw/net/rocker: Don't use *_to_cpup(), Peter Maydell, 2016/06/16
- [Qemu-devel] [PATCH 5/5] hw/net/e1000: Don't use *_to_cpup(), Peter Maydell, 2016/06/16
- Re: [Qemu-devel] [PATCH 0/5] hw/net: Don't use cpu_to_*w() and *_to_cpup(), Richard Henderson, 2016/06/17
- Re: [Qemu-devel] [PATCH 0/5] hw/net: Don't use cpu_to_*w() and *_to_cpup(), Jason Wang, 2016/06/19
- Re: [Qemu-devel] [PATCH 0/5] hw/net: Don't use cpu_to_*w() and *_to_cpup(), Peter Maydell, 2016/06/27