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

bswap.h: Remove cpu_to_32wu() 

Replace the legacy cpu_to_32wu() with stl_p().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1383669517-25598-10-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
This commit is contained in:
Peter Maydell 2013-11-05 16:38:37 +00:00 committed by Anthony Liguori
parent e4ef9f465c
commit 7d579514a5
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/display/vga_template.h
View File

@ -113,20 +113,22 @@ static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize,
do { do {
font_data = font_ptr[0]; font_data = font_ptr[0];
#if BPP == 1 #if BPP == 1
cpu_to_32wu((uint32_t *)d, (dmask16[(font_data >> 4)] & xorcol) ^ bgcol); stl_p((uint32_t *)d, (dmask16[(font_data >> 4)] & xorcol) ^ bgcol);
v = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol; v = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol;
cpu_to_32wu(((uint32_t *)d)+1, v); stl_p(((uint32_t *)d)+1, v);
if (dup9) if (dup9)
((uint8_t *)d)[8] = v >> (24 * (1 - BIG)); ((uint8_t *)d)[8] = v >> (24 * (1 - BIG));
else else
((uint8_t *)d)[8] = bgcol; ((uint8_t *)d)[8] = bgcol;
#elif BPP == 2 #elif BPP == 2
cpu_to_32wu(((uint32_t *)d)+0, (dmask4[(font_data >> 6)] & xorcol) ^ bgcol); stl_p(((uint32_t *)d)+0, (dmask4[(font_data >> 6)] & xorcol) ^ bgcol);
cpu_to_32wu(((uint32_t *)d)+1, (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol); stl_p(((uint32_t *)d)+1,
cpu_to_32wu(((uint32_t *)d)+2, (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol); (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol);
stl_p(((uint32_t *)d)+2,
(dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol);
v = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol; v = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol;
cpu_to_32wu(((uint32_t *)d)+3, v); stl_p(((uint32_t *)d)+3, v);
if (dup9) if (dup9)
((uint16_t *)d)[8] = v >> (16 * (1 - BIG)); ((uint16_t *)d)[8] = v >> (16 * (1 - BIG));
else else

7
include/qemu/bswap.h
View File

@ -410,13 +410,6 @@ static inline void stfq_be_p(void *ptr, float64 v)
stq_be_p(ptr, u.ll); stq_be_p(ptr, u.ll);
} }
/* Legacy unaligned versions. Note that we never had a complete set. */
static inline void cpu_to_32wu(uint32_t *p, uint32_t v)
{
stl_p(p, v);
}
static inline unsigned long leul_to_cpu(unsigned long v) static inline unsigned long leul_to_cpu(unsigned long v)
{ {
/* In order to break an include loop between here and /* In order to break an include loop between here and