diff mbox

[12/12] hw/pci-host/apb.c: Avoid shifting left into sign bit

Message ID 1394478649-9453-13-git-send-email-peter.maydell@linaro.org
State Superseded
Headers show

Commit Message

Peter Maydell March 10, 2014, 7:10 p.m. UTC
Add U suffix to avoid undefined behaviour.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/pci-host/apb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael S. Tsirkin March 10, 2014, 9:59 p.m. UTC | #1
On Mon, Mar 10, 2014 at 07:10:48PM +0000, Peter Maydell wrote:
> Add U suffix to avoid undefined behaviour.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

While not required for correctness, it would be cleaner
to change all constants around this line to 1U <<, for consistency.

> ---
>  hw/pci-host/apb.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
> index 1b399dd..a6869b8 100644
> --- a/hw/pci-host/apb.c
> +++ b/hw/pci-host/apb.c
> @@ -58,7 +58,7 @@ do { printf("APB: " fmt , ## __VA_ARGS__); } while (0)
>  #define PBM_PCI_IMR_MASK    0x7fffffff
>  #define PBM_PCI_IMR_ENABLED 0x80000000
>  
> -#define POR          (1 << 31)
> +#define POR          (1U << 31)
>  #define SOFT_POR     (1 << 30)
>  #define SOFT_XIR     (1 << 29)
>  #define BTN_POR      (1 << 28)
> -- 
> 1.9.0
>
Michael Tokarev March 14, 2014, 4:45 p.m. UTC | #2
11.03.2014 01:59, Michael S. Tsirkin wrote:
> On Mon, Mar 10, 2014 at 07:10:48PM +0000, Peter Maydell wrote:
>> Add U suffix to avoid undefined behaviour.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> 
> While not required for correctness, it would be cleaner
> to change all constants around this line to 1U <<, for consistency.

I agree, this is what I thought as well when looking at the result.
I can fix when applying if you like.

Thanks,

/mjt


>> ---
>>  hw/pci-host/apb.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
>> index 1b399dd..a6869b8 100644
>> --- a/hw/pci-host/apb.c
>> +++ b/hw/pci-host/apb.c
>> @@ -58,7 +58,7 @@ do { printf("APB: " fmt , ## __VA_ARGS__); } while (0)
>>  #define PBM_PCI_IMR_MASK    0x7fffffff
>>  #define PBM_PCI_IMR_ENABLED 0x80000000
>>  
>> -#define POR          (1 << 31)
>> +#define POR          (1U << 31)
>>  #define SOFT_POR     (1 << 30)
>>  #define SOFT_XIR     (1 << 29)
>>  #define BTN_POR      (1 << 28)


>> 1.9.0
>>
>
diff mbox

Patch

diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index 1b399dd..a6869b8 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -58,7 +58,7 @@  do { printf("APB: " fmt , ## __VA_ARGS__); } while (0)
 #define PBM_PCI_IMR_MASK    0x7fffffff
 #define PBM_PCI_IMR_ENABLED 0x80000000
 
-#define POR          (1 << 31)
+#define POR          (1U << 31)
 #define SOFT_POR     (1 << 30)
 #define SOFT_XIR     (1 << 29)
 #define BTN_POR      (1 << 28)