Commit def60298 authored by Peter Maydell's avatar Peter Maydell Committed by Michael Tokarev
Browse files

hw/intc/openpic: Avoid shifting left into sign bit 



Add U suffix to avoid undefined behaviour. This is only strictly
necessary for the 1 << 31 cases; for consistency we extend it
to other constants in the same group.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 00b01793

hw/intc/openpic.c

+7 −7
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static FslMpicInfo fsl_mpic_42 = { 
#define TCCR_TOG          0x80000000 /* toggles when decrement to zero */



#define IDR_EP_SHIFT      31

#define IDR_EP_MASK       (1 << IDR_EP_SHIFT)

#define IDR_EP_MASK       (1U << IDR_EP_SHIFT)

#define IDR_CI0_SHIFT     30

#define IDR_CI1_SHIFT     29

#define IDR_P1_SHIFT      1
@@ -220,17 +220,17 @@ typedef struct IRQSource { 
} IRQSource;



#define IVPR_MASK_SHIFT       31

#define IVPR_MASK_MASK        (1 << IVPR_MASK_SHIFT)

#define IVPR_MASK_MASK        (1U << IVPR_MASK_SHIFT)

#define IVPR_ACTIVITY_SHIFT   30

#define IVPR_ACTIVITY_MASK    (1 << IVPR_ACTIVITY_SHIFT)

#define IVPR_ACTIVITY_MASK    (1U << IVPR_ACTIVITY_SHIFT)

#define IVPR_MODE_SHIFT       29

#define IVPR_MODE_MASK        (1 << IVPR_MODE_SHIFT)

#define IVPR_MODE_MASK        (1U << IVPR_MODE_SHIFT)

#define IVPR_POLARITY_SHIFT   23

#define IVPR_POLARITY_MASK    (1 << IVPR_POLARITY_SHIFT)

#define IVPR_POLARITY_MASK    (1U << IVPR_POLARITY_SHIFT)

#define IVPR_SENSE_SHIFT      22

#define IVPR_SENSE_MASK       (1 << IVPR_SENSE_SHIFT)

#define IVPR_SENSE_MASK       (1U << IVPR_SENSE_SHIFT)



#define IVPR_PRIORITY_MASK     (0xF << 16)

#define IVPR_PRIORITY_MASK     (0xFU << 16)

#define IVPR_PRIORITY(_ivprr_) ((int)(((_ivprr_) & IVPR_PRIORITY_MASK) >> 16))

#define IVPR_VECTOR(opp, _ivprr_) ((_ivprr_) & (opp)->vector_mask)