Fix warnings introduced in r5948
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5976 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
371bc573e5
commit
e01fe6d575
14
cpu-all.h
14
cpu-all.h
@ -234,7 +234,7 @@ static inline int lduw_le_p(const void *ptr)
|
|||||||
__asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr));
|
__asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr));
|
||||||
return val;
|
return val;
|
||||||
#else
|
#else
|
||||||
uint8_t *p = ptr;
|
const uint8_t *p = ptr;
|
||||||
return p[0] | (p[1] << 8);
|
return p[0] | (p[1] << 8);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -246,7 +246,7 @@ static inline int ldsw_le_p(const void *ptr)
|
|||||||
__asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr));
|
__asm__ __volatile__ ("lhbrx %0,0,%1" : "=r" (val) : "r" (ptr));
|
||||||
return (int16_t)val;
|
return (int16_t)val;
|
||||||
#else
|
#else
|
||||||
uint8_t *p = ptr;
|
const uint8_t *p = ptr;
|
||||||
return (int16_t)(p[0] | (p[1] << 8));
|
return (int16_t)(p[0] | (p[1] << 8));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -258,14 +258,14 @@ static inline int ldl_le_p(const void *ptr)
|
|||||||
__asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (ptr));
|
__asm__ __volatile__ ("lwbrx %0,0,%1" : "=r" (val) : "r" (ptr));
|
||||||
return val;
|
return val;
|
||||||
#else
|
#else
|
||||||
uint8_t *p = ptr;
|
const uint8_t *p = ptr;
|
||||||
return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
|
return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline uint64_t ldq_le_p(const void *ptr)
|
static inline uint64_t ldq_le_p(const void *ptr)
|
||||||
{
|
{
|
||||||
uint8_t *p = ptr;
|
const uint8_t *p = ptr;
|
||||||
uint32_t v1, v2;
|
uint32_t v1, v2;
|
||||||
v1 = ldl_le_p(p);
|
v1 = ldl_le_p(p);
|
||||||
v2 = ldl_le_p(p + 4);
|
v2 = ldl_le_p(p + 4);
|
||||||
@ -413,7 +413,7 @@ static inline int lduw_be_p(const void *ptr)
|
|||||||
: "m" (*(uint16_t *)ptr));
|
: "m" (*(uint16_t *)ptr));
|
||||||
return val;
|
return val;
|
||||||
#else
|
#else
|
||||||
uint8_t *b = (uint8_t *) ptr;
|
const uint8_t *b = ptr;
|
||||||
return ((b[0] << 8) | b[1]);
|
return ((b[0] << 8) | b[1]);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -428,7 +428,7 @@ static inline int ldsw_be_p(const void *ptr)
|
|||||||
: "m" (*(uint16_t *)ptr));
|
: "m" (*(uint16_t *)ptr));
|
||||||
return (int16_t)val;
|
return (int16_t)val;
|
||||||
#else
|
#else
|
||||||
uint8_t *b = (uint8_t *) ptr;
|
const uint8_t *b = ptr;
|
||||||
return (int16_t)((b[0] << 8) | b[1]);
|
return (int16_t)((b[0] << 8) | b[1]);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -443,7 +443,7 @@ static inline int ldl_be_p(const void *ptr)
|
|||||||
: "m" (*(uint32_t *)ptr));
|
: "m" (*(uint32_t *)ptr));
|
||||||
return val;
|
return val;
|
||||||
#else
|
#else
|
||||||
uint8_t *b = (uint8_t *) ptr;
|
const uint8_t *b = ptr;
|
||||||
return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3];
|
return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3];
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user