Commit 7d579514 authored by Peter Maydell's avatar Peter Maydell Committed by Anthony Liguori
Browse files

bswap.h: Remove cpu_to_32wu() 



Replace the legacy cpu_to_32wu() with stl_p().

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-id: 1383669517-25598-10-git-send-email-peter.maydell@linaro.org
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parent e4ef9f46

hw/display/vga_template.h

+8 −6
Original line number Diff line number Diff line
@@ -113,20 +113,22 @@ static void glue(vga_draw_glyph9_, DEPTH)(uint8_t *d, int linesize, 
    do {

        font_data = font_ptr[0];

#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;

        cpu_to_32wu(((uint32_t *)d)+1, v);

        stl_p(((uint32_t *)d)+1, v);

        if (dup9)

            ((uint8_t *)d)[8] = v >> (24 * (1 - BIG));

        else

            ((uint8_t *)d)[8] = bgcol;



#elif BPP == 2

        cpu_to_32wu(((uint32_t *)d)+0, (dmask4[(font_data >> 6)] & xorcol) ^ bgcol);

        cpu_to_32wu(((uint32_t *)d)+1, (dmask4[(font_data >> 4) & 3] & xorcol) ^ bgcol);

        cpu_to_32wu(((uint32_t *)d)+2, (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol);

        stl_p(((uint32_t *)d)+0, (dmask4[(font_data >> 6)] & xorcol) ^ bgcol);

        stl_p(((uint32_t *)d)+1,

              (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;

        cpu_to_32wu(((uint32_t *)d)+3, v);

        stl_p(((uint32_t *)d)+3, v);

        if (dup9)

            ((uint16_t *)d)[8] = v >> (16 * (1 - BIG));

        else

include/qemu/bswap.h

+0 −7
Original line number Diff line number Diff line
@@ -410,13 +410,6 @@ static inline void stfq_be_p(void *ptr, float64 v) 
    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)

{

    /* In order to break an include loop between here and