diff options
| author | Peter Maydell | 2015-03-11 17:30:33 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-11 17:30:33 +0100 |
| commit | d598911b6f5e7bf7bafb63b8e1d074729e94aca7 (patch) | |
| tree | 4adfbc7a7c32f771c3db8f603177efaa05c9ecca /include/qemu/bitops.h | |
| parent | Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150310' into s... (diff) | |
| parent | bitops.h: sextract64() return type should be int64_t, not uint64_t (diff) | |
| download | qemu-d598911b6f5e7bf7bafb63b8e1d074729e94aca7.tar.gz qemu-d598911b6f5e7bf7bafb63b8e1d074729e94aca7.tar.xz qemu-d598911b6f5e7bf7bafb63b8e1d074729e94aca7.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150311' into staging
target-arm queue:
* fix a bug in bitops.h
* implement SD card support on integratorcp
* add a missing 'compatible' property for Cortex-A57
* add Netduino 2 machine model
* fix command line parsing bug for CPU options with multiple CPUs
# gpg: Signature made Wed Mar 11 14:14:22 2015 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
* remotes/pmaydell/tags/pull-target-arm-20150311:
bitops.h: sextract64() return type should be int64_t, not uint64_t
integrator/cp: Implement CARDIN and WPROT signals
integrator/cp: Model CP control registers as sysbus device
target-arm: Add missing compatible property to A57
netduino2: Add the Netduino 2 Machine
stm32f205: Add the stm32f205 SoC
stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG
stm32f2xx_USART: Add the stm32f2xx USART Controller
stm32f2xx_timer: Add the stm32f2xx Timer
hw/arm/virt: fix cmdline parsing bug with CPU options and smp > 1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/bitops.h')
| -rw-r--r-- | include/qemu/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h index 181bd46063..90ca8df4e2 100644 --- a/include/qemu/bitops.h +++ b/include/qemu/bitops.h @@ -354,7 +354,7 @@ static inline int32_t sextract32(uint32_t value, int start, int length) * Returns: the sign extended value of the bit field extracted from the * input value. */ -static inline uint64_t sextract64(uint64_t value, int start, int length) +static inline int64_t sextract64(uint64_t value, int start, int length) { assert(start >= 0 && length > 0 && length <= 64 - start); /* Note that this implementation relies on right shift of signed |