ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/net/eepro100.c: Don't use cpu_to_*w() and *_to_cpup() 

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 <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Dmitry Fleytman <dmitry@daynix.com <mailto:dmitry@daynix.com>>
Message-id: 1466097446-981-2-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2016-06-16 18:17:22 +01:00
parent f12103afaa
commit 4d9be25200
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/net/eepro100.c
View File

@ -352,14 +352,14 @@ static unsigned e100_compute_mcast_idx(const uint8_t *ep)
static uint16_t e100_read_reg2(EEPRO100State *s, E100RegisterOffset addr) static uint16_t e100_read_reg2(EEPRO100State *s, E100RegisterOffset addr)
{ {
assert(!((uintptr_t)&s->mem[addr] & 1)); 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. */ /* Read a 32 bit control/status (CSR) register. */
static uint32_t e100_read_reg4(EEPRO100State *s, E100RegisterOffset addr) static uint32_t e100_read_reg4(EEPRO100State *s, E100RegisterOffset addr)
{ {
assert(!((uintptr_t)&s->mem[addr] & 3)); 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. */ /* Write a 16 bit control/status (CSR) register. */
@ -367,7 +367,7 @@ static void e100_write_reg2(EEPRO100State *s, E100RegisterOffset addr,
uint16_t val) uint16_t val)
{ {
assert(!((uintptr_t)&s->mem[addr] & 1)); 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. */ /* Read a 32 bit control/status (CSR) register. */
@ -375,7 +375,7 @@ static void e100_write_reg4(EEPRO100State *s, E100RegisterOffset addr,
uint32_t val) uint32_t val)
{ {
assert(!((uintptr_t)&s->mem[addr] & 3)); 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) #if defined(DEBUG_EEPRO100)