Changeset 587478b in mainline

Timestamp:

2018-06-14T19:02:26Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3b1cc8d

Parents:

2f7d77c6

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-14 18:35:46)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-14 19:02:26)

Message:

Fix some undefined behaviors.

Location:

uspace

Files:

• drv/bus/pci/pciintel/pci.c (modified) (1 diff)
• lib/c/include/io/pixel.h (modified) (1 diff)

uspace/drv/bus/pci/pciintel/pci.c

@@ -63 +63 @@
 #define NAME "pciintel"
 
-#define CONF_ADDR_ENABLE        (1 << 31)
+#define CONF_ADDR_ENABLE        (((unsigned)1) << 31)
 #define CONF_ADDR(bus, dev, fn, reg) \
         ((bus << 16) | (dev << 11) | (fn << 8) | (reg & ~3))

uspace/lib/c/include/io/pixel.h

@@ -50 +50 @@
 
 #define PIXEL(a, r, g, b) \
-        ((((a) & 0xff) << 24) | (((r) & 0xff) << 16) | \
-        (((g) & 0xff) << 8) | ((b) & 0xff))
+        ((((unsigned)(a) & 0xff) << 24) | (((unsigned)(r) & 0xff) << 16) | \
+        (((unsigned)(g) & 0xff) << 8) | ((unsigned)(b) & 0xff))
 
 typedef uint32_t pixel_t;