OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Define macro QEMU_GNUC_PREREQ and use it 

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5467 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2008-10-12 16:15:04 +00:00
parent 5b7ada46e5
commit bad5b1ec8e
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
host-utils.h
View File

@ -51,7 +51,7 @@ void mulu64(uint64_t *phigh, uint64_t *plow, uint64_t a, uint64_t b);
static always_inline int clz32(uint32_t val)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#if QEMU_GNUC_PREREQ(3, 4)
if (val)
return __builtin_clz(val);
else
@ -93,7 +93,7 @@ static always_inline int clo32(uint32_t val)
static always_inline int clz64(uint64_t val)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#if QEMU_GNUC_PREREQ(3, 4)
if (val)
return __builtin_clzll(val);
else
@ -118,7 +118,7 @@ static always_inline int clo64(uint64_t val)
static always_inline int ctz32 (uint32_t val)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#if QEMU_GNUC_PREREQ(3, 4)
if (val)
return __builtin_ctz(val);
else
@ -162,7 +162,7 @@ static always_inline int cto32 (uint32_t val)
static always_inline int ctz64 (uint64_t val)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#if QEMU_GNUC_PREREQ(3, 4)
if (val)
return __builtin_ctz(val);
else
@ -206,7 +206,7 @@ static always_inline int ctpop16 (uint16_t val)
static always_inline int ctpop32 (uint32_t val)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#if QEMU_GNUC_PREREQ(3, 4)
return __builtin_popcount(val);
#else
val = (val & 0x55555555) + ((val >> 1) & 0x55555555);
@ -221,7 +221,7 @@ static always_inline int ctpop32 (uint32_t val)
static always_inline int ctpop64 (uint64_t val)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#if QEMU_GNUC_PREREQ(3, 4)
return __builtin_popcountll(val);
#else
val = (val & 0x5555555555555555ULL) + ((val >> 1) & 0x5555555555555555ULL);

5
hw/apic.c
View File

@ -20,6 +20,7 @@
#include "hw.h"
#include "pc.h"
#include "qemu-timer.h"
#include "osdep.h"
//#define DEBUG_APIC
//#define DEBUG_IOAPIC
@ -107,7 +108,7 @@ static void apic_update_irq(APICState *s);
/* Find first bit starting from msb */
static int fls_bit(uint32_t value)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#if QEMU_GNUC_PREREQ(3, 4)
return 31 - __builtin_clz(value);
#else
unsigned int ret = 0;
@ -127,7 +128,7 @@ static int fls_bit(uint32_t value)
/* Find first bit starting from lsb */
static int ffs_bit(uint32_t value)
{
#if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
#if QEMU_GNUC_PREREQ(3, 4)
return __builtin_ffs(value) - 1;
#else
unsigned int ret = 0;

7
osdep.h
View File

@ -62,6 +62,13 @@
#define qemu_printf printf
#if defined (__GNUC__) && defined (__GNUC_MINOR_)
# define QEMU_GNUC_PREREQ(maj, min) \
((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
#else
# define QEMU_GNUC_PREREQ(maj, min) 0
#endif
void *qemu_memalign(size_t alignment, size_t size);
void *qemu_vmalloc(size_t size);
void qemu_vfree(void *ptr);