Commit 7a3df11c authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

memory: inline and optimize devend_memop 



devend_memop can rely on the fact that the result is always either
0 or MO_BSWAP, corresponding respectively to host endianness and
the opposite.  Native (target) endianness in turn can be either
the host endianness, in which case MO_BSWAP is only returned for
host-opposite endianness, or the opposite, in which case 0 is only
returned for host endianness.

With this in mind, devend_memop can be compiled as a setcond+shift
for every target.  Do this and, while at it, move it to
include/exec/memory.h since !NEED_CPU_H files do not (and should not)
need it.

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 72d41eb4

include/exec/memory.h

+18 −1
Original line number Diff line number Diff line
@@ -2201,8 +2201,25 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, 
    }

}



#ifdef NEED_CPU_H

/* enum device_endian to MemOp.  */

MemOp devend_memop(enum device_endian end);

static inline MemOp devend_memop(enum device_endian end)

{

    QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN &&

                      DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN);



#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)

    /* Swap if non-host endianness or native (target) endianness */

    return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP;

#else

    const int non_host_endianness =

        DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN;



    /* In this case, native (target) endianness needs no swap.  */

    return (end == non_host_endianness) ? MO_BSWAP : 0;

#endif

}

#endif



#endif

memory.c

+0 −18
Original line number Diff line number Diff line
@@ -3267,21 +3267,3 @@ static void memory_register_types(void) 
}



type_init(memory_register_types)
 


MemOp devend_memop(enum device_endian end)

{

    static MemOp conv[] = {

        [DEVICE_LITTLE_ENDIAN] = MO_LE,

        [DEVICE_BIG_ENDIAN] = MO_BE,

        [DEVICE_NATIVE_ENDIAN] = MO_TE,

        [DEVICE_HOST_ENDIAN] = 0,

    };

    switch (end) {

    case DEVICE_LITTLE_ENDIAN:

    case DEVICE_BIG_ENDIAN:

    case DEVICE_NATIVE_ENDIAN:

        return conv[end];

    default:

        g_assert_not_reached();

    }

}