Fix parenthesizing and formatting of C macros

LibOS/shim/include/glibc-version.h

@@ -1,6 +1,6 @@
 /* update the file whenever changes made to glibc.
    pick whatever random value. */
 
-#define GLIBC_VERSION      (20170114)
+#define GLIBC_VERSION 20170114
 
 int register_library (const char * name, unsigned long load_address);

LibOS/shim/include/shim_checkpoint.h

@@ -186,7 +186,7 @@ enum {
                                                                     \
             store->bound = new_bound;                               \
         }                                                           \
-        store->offset += size;                                      \
+        store->offset += (size);                                    \
     _off;  })
 
 #define ADD_CP_ENTRY(type, value)                                   \
@@ -313,13 +313,13 @@ enum {
 #define DO_CP_SIZE(name, obj, size, objp)                       \
     do {                                                        \
         extern DEFINE_CP_FUNC(name);                            \
-        int ret = cp_##name(store, obj, size, (void **) objp);  \
+        int ret = cp_##name(store, obj, size, (void**)(objp));  \
         if (ret < 0) return ret;                                \
     } while (0)
 
 
 #define DO_CP(name, obj, objp)                                  \
-        DO_CP_SIZE(name, obj, sizeof(*obj), objp)
+        DO_CP_SIZE(name, obj, sizeof(*(obj)), objp)
 
 #define DO_CP_MEMBER(name, obj, newobj, member)                 \
         DO_CP(name, (obj)->member, &((newobj)->member));
@@ -338,14 +338,14 @@ get_cp_map_entry (void * map, void * addr, bool create);
 #define GET_FROM_CP_MAP(obj)                                    \
     ({                                                          \
         struct shim_cp_map_entry * e =                          \
-                get_cp_map_entry(store->cp_map, (obj), false);  \
+                get_cp_map_entry(store->cp_map, obj, false);    \
     e ? e->off : 0; })
 
 #define ADD_TO_CP_MAP(obj, off)                                 \
     do {                                                        \
         struct shim_cp_map_entry * e =                          \
-                get_cp_map_entry(store->cp_map, (obj), true);   \
-        e->off = off;                                           \
+                get_cp_map_entry(store->cp_map, obj, true);     \
+        e->off = (off);                                         \
     } while (0)
 
 #define BEGIN_MIGRATION_DEF(name, ...)                                  \
@@ -362,7 +362,7 @@ get_cp_map_entry (void * map, void * addr, bool create);
 #define DEFINE_MIGRATE(name, obj, size)                                 \
     do {                                                                \
         extern DEFINE_CP_FUNC(name);                                    \
-        if ((ret = cp_##name(store, (obj), (size), NULL)) < 0)          \
+        if ((ret = cp_##name(store, obj, size, NULL)) < 0)              \
             return ret;                                                 \
     } while (0)
 
@@ -390,7 +390,7 @@ get_cp_map_entry (void * map, void * addr, bool create);
             }                                                               \
             SAVE_PROFILE_INTERVAL(checkpoint_create_map);                   \
                                                                             \
-            ret = migrate_##name((store), ##__VA_ARGS__);                   \
+            ret = migrate_##name(store, ##__VA_ARGS__);                     \
             if (ret < 0)                                                    \
                 goto out;                                                   \
                                                                             \

LibOS/shim/include/shim_fs.h

@@ -130,7 +130,7 @@ struct shim_fs_ops {
                                     * well-defined. */
 
 // Catch memory corruption issues by checking for invalid state values
-#define DENTRY_INVALID_FLAGS ~0x7FFF
+#define DENTRY_INVALID_FLAGS (~0x7FFF)
 
 #define DCACHE_HASH_SIZE    1024
 #define DCACHE_HASH(hash) ((hash) & (DCACHE_HASH_SIZE - 1))

LibOS/shim/include/shim_handle.h

@@ -97,7 +97,7 @@ struct shim_file_handle {
 };
 
 #define FILE_HANDLE_DATA(hdl)   ((hdl)->info.file.data)
-#define FILE_DENTRY_DATA(dent)  ((struct shim_file_data *) (dent)->data)
+#define FILE_DENTRY_DATA(dent)  ((struct shim_file_data*)(dent)->data)
 
 struct shim_dev_ops {
     /* open: provide a filename relative to the mount point and flags,
@@ -398,7 +398,7 @@ struct shim_handle_map {
 };
 
 /* allocating file descriptors */
-#define FD_NULL ((FDTYPE) -1)
+#define FD_NULL ((FDTYPE)-1)
 #define HANDLE_ALLOCATED(fd_handle) ((fd_handle) && (fd_handle)->vfd != FD_NULL)
 
 struct shim_handle * __get_fd_handle (FDTYPE fd, int * flags,

LibOS/shim/include/shim_internal.h

@@ -210,7 +210,7 @@ static inline uint64_t get_cur_preempt (void) {
 }
 
 #define BEGIN_SHIM(name, args ...)                          \
-    SHIM_ARG_TYPE __shim_##name (args) {                    \
+    SHIM_ARG_TYPE __shim_##name(args) {                     \
         SHIM_ARG_TYPE ret = 0;                              \
         uint64_t preempt = get_cur_preempt();               \
         /* handle_signal(true); */                          \
@@ -281,7 +281,7 @@ void parse_syscall_after (int sysno, const char * name, int nr, ...);
 #define SHIM_SYSCALL_0(name, func, r)                           \
     BEGIN_SHIM(name, void)                                      \
         PARSE_SYSCALL1(name, 0);                                \
-        r __ret = func();                                       \
+        r __ret = (func)();                                     \
         PARSE_SYSCALL2(name, 0, #r, __ret);                     \
         ret = (SHIM_ARG_TYPE) __ret;                            \
     END_SHIM(name)
@@ -290,7 +290,7 @@ void parse_syscall_after (int sysno, const char * name, int nr, ...);
     BEGIN_SHIM(name, SHIM_ARG_TYPE __arg1)                                  \
         t1 a1 = (t1) __arg1;                                                \
         PARSE_SYSCALL1(name, 1, #t1, a1);                                   \
-        r __ret = func(a1);                                                 \
+        r __ret = (func)(a1);                                               \
         PARSE_SYSCALL2(name, 1, #r, __ret, #t1, a1);                        \
         ret = (SHIM_ARG_TYPE) __ret;                                        \
     END_SHIM(name)
@@ -300,7 +300,7 @@ void parse_syscall_after (int sysno, const char * name, int nr, ...);
         t1 a1 = (t1) __arg1;                                                \
         t2 a2 = (t2) __arg2;                                                \
         PARSE_SYSCALL1(name, 2, #t1, a1, #t2, a2);                          \
-        r __ret = func(a1, a2);                                             \
+        r __ret = (func)(a1, a2);                                           \
         PARSE_SYSCALL2(name, 2, #r, __ret, #t1, a1, #t2, a2);               \
         ret = (SHIM_ARG_TYPE) __ret;                                        \
     END_SHIM(name)
@@ -312,7 +312,7 @@ void parse_syscall_after (int sysno, const char * name, int nr, ...);
         t2 a2 = (t2) __arg2;                                                \
         t3 a3 = (t3) __arg3;                                                \
         PARSE_SYSCALL1(name, 3, #t1, a1, #t2, a2, #t3, a3);                 \
-        r __ret = func(a1, a2, a3);                                         \
+        r __ret = (func)(a1, a2, a3);                                       \
         PARSE_SYSCALL2(name, 3, #r, __ret, #t1, a1, #t2, a2, #t3, a3);      \
         ret = (SHIM_ARG_TYPE) __ret;                                        \
     END_SHIM(name)
@@ -325,7 +325,7 @@ void parse_syscall_after (int sysno, const char * name, int nr, ...);
         t3 a3 = (t3) __arg3;                                                \
         t4 a4 = (t4) __arg4;                                                \
         PARSE_SYSCALL1(name, 4, #t1, a1, #t2, a2, #t3, a3, #t4, a4);        \
-        r __ret = func(a1, a2, a3, a4);                                     \
+        r __ret = (func)(a1, a2, a3, a4);                                   \
         PARSE_SYSCALL2(name, 4, #r, __ret, #t1, a1, #t2, a2, #t3, a3,       \
                        #t4, a4);                                            \
         ret = (SHIM_ARG_TYPE) __ret;                                        \
@@ -342,7 +342,7 @@ void parse_syscall_after (int sysno, const char * name, int nr, ...);
         t5 a5 = (t5) __arg5;                                                \
         PARSE_SYSCALL1(name, 5, #t1, a1, #t2, a2, #t3, a3, #t4, a4,         \
                        #t5, a5);                                            \
-        r __ret = func(a1, a2, a3, a4, a5);                                 \
+        r __ret = (func)(a1, a2, a3, a4, a5);                               \
         PARSE_SYSCALL2(name, 5, #r, __ret, #t1, a1, #t2, a2, #t3, a3,       \
                        #t4, a4, #t5, a5);                                   \
         ret = (SHIM_ARG_TYPE) __ret;                                        \
@@ -360,7 +360,7 @@ void parse_syscall_after (int sysno, const char * name, int nr, ...);
         t6 a6 = (t6) __arg6;                                                \
         PARSE_SYSCALL1(name, 6, #t1, a1, #t2, a2, #t3, a3, #t4, a4,         \
                        #t5, a5, #t6, a6);                                   \
-        r __ret = func(a1, a2, a3, a4, a5, a6);                             \
+        r __ret = (func)(a1, a2, a3, a4, a5, a6);                           \
         PARSE_SYSCALL2(name, 6, #r, __ret, #t1, a1, #t2, a2, #t3, a3,       \
                        #t4, a4, #t5, a5, #t6, a6);  \
         ret = (SHIM_ARG_TYPE) __ret;                                        \
@@ -554,7 +554,7 @@ static inline bool locked(struct shim_lock* l)
     return tcb->tid == l->owner;
 }
 
-#define DEBUG_MASTER_LOCK       0
+#define DEBUG_MASTER_LOCK 0
 
 extern struct shim_lock __master_lock;
 
@@ -650,8 +650,8 @@ static inline void do_pause (void)
 }
 
 /* reference counter APIs */
-#define REF_GET(ref)            atomic_read(&ref)
-#define REF_SET(ref, count)     atomic_set(&ref, count)
+#define REF_GET(ref)            atomic_read(&(ref))
+#define REF_SET(ref, count)     atomic_set(&(ref), count)
 
 static inline int __ref_inc (REFTYPE * ref)
 {
@@ -739,11 +739,11 @@ unsigned long parse_int (const char * str);
 extern void * initial_stack;
 extern const char ** initial_envp;
 
-#define ALIGNED(addr)   (!(((unsigned long) addr) & allocshift))
+#define ALIGNED(addr)   (!(((unsigned long)(addr)) & allocshift))
 #define ALIGN_UP(addr)      \
-    ((__typeof__(addr)) ((((unsigned long) addr) + allocshift) & allocmask))
+    ((__typeof__(addr)) ((((unsigned long)(addr)) + allocshift) & allocmask))
 #define ALIGN_DOWN(addr)    \
-    ((__typeof__(addr)) (((unsigned long) addr) & allocmask))
+    ((__typeof__(addr)) (((unsigned long)(addr)) & allocmask))
 
 void get_brk_region (void ** start, void ** end, void ** current);
 

LibOS/shim/include/shim_ipc.h

@@ -405,7 +405,7 @@ struct shim_ipc_sysv_semop {
     struct sembuf sops[];
 } __attribute__((packed));
 
-#define IPC_SEM_NOTIMEOUT ((unsigned long) -1)
+#define IPC_SEM_NOTIMEOUT ((unsigned long)-1)
 
 int ipc_sysv_semop_send (IDTYPE semid, struct sembuf * sops, int nsops,
                          unsigned long timeout, unsigned long * seq);
@@ -606,7 +606,7 @@ void ipc_child_exit   (struct shim_ipc_port * port, IDTYPE vmid,
 
 int exit_with_ipc_helper (bool handover, struct shim_thread ** ret);
 
-#define IPC_FORCE_RECONNECT     ((void *) -1)
+#define IPC_FORCE_RECONNECT     ((void*)-1)
 
 int prepare_ns_leaders (void);
 

LibOS/shim/include/shim_profile.h

@@ -144,10 +144,10 @@ extern struct shim_profile __profile_end;
 
 #define BEGIN_PROFILE_INTERVAL_SET(val)                     \
     unsigned long _interval;                                \
-    do { _interval = val; } while (0)
+    do { _interval = (val); } while (0)
 
 #define SET_PROFILE_INTERVAL(val)                           \
-    do { _interval = val; } while (0)
+    do { _interval = (val); } while (0)
 
 #define GET_PROFILE_INTERVAL() DkSystemTimeQuery()
 

LibOS/shim/include/shim_unistd_defs.h

@@ -4,7 +4,7 @@
 #ifndef _SHIM_UNISTD_DEFS_H_
 #define _SHIM_UNISTD_DEFS_H_
 
-#define LIBOS_SYSCALL_BASE      (340)
-#define LIBOS_SYSCALL_BOUND     (380)
+#define LIBOS_SYSCALL_BASE      340
+#define LIBOS_SYSCALL_BOUND     380
 
 #endif

LibOS/shim/src/bookkeep/shim_vma.c

@@ -880,7 +880,7 @@ void * bkeep_unmapped_heap (uint64_t length, int prot, int flags,
      * If MAP_32BIT is given in the flags, force the searching range to
      * be lower than 1ULL << 32.
      */
-#define ADDR_32BIT ((void *) (1ULL << 32))
+#define ADDR_32BIT ((void*)(1ULL << 32))
 
     if (flags & MAP_32BIT) {
         /* Try the lower 4GB memory space */

LibOS/shim/src/elf/dl-machine-x86_64.h

@@ -72,12 +72,12 @@ elf_machine_rela (struct link_map * l, ElfW(Rela) * reloc, Elf64_Sym * sym,
 
 #ifdef DEBUG_RELOC
 #define debug_reloc(r_type, sym, value)                             \
-    ({  if (strtab && sym && sym->st_name)                          \
-            debug(#r_type ": %s\n", strtab + sym->st_name);         \
+    ({  if (strtab && (sym) && (sym)->st_name)                      \
+            debug(#r_type ": %s\n", strtab + (sym)->st_name);       \
         else if (value)                                             \
-            debug(#r_type ": %p\n", value);                         \
+            debug(#r_type ": %p\n", (value));                       \
         else                                                        \
-            debug(#r_type "\n", value);                             \
+            debug(#r_type "\n", (value));                           \
     })
 #else
 #define debug_reloc(...) ({})

LibOS/shim/src/elf/do-rel.h

@@ -28,7 +28,7 @@
 #include "dl-machine-x86_64.h"
 
 #define elf_dynamic_do_rel          elf_dynamic_do_rela
-#define RELCOUNT_IDX                VERSYMIDX (DT_RELACOUNT)
+#define RELCOUNT_IDX                VERSYMIDX(DT_RELACOUNT)
 #define Rel                         Rela
 #define elf_machine_rel             elf_machine_rela
 #define elf_machine_rel_relative    elf_machine_rela_relative
@@ -36,17 +36,17 @@
 
 #ifndef DO_ELF_MACHINE_REL_RELATIVE
 # define DO_ELF_MACHINE_REL_RELATIVE(l, relative)           \
-    elf_machine_rel_relative (l, relative,                  \
-                              (void *) (l->l_addr + relative->r_offset))
+    elf_machine_rel_relative(l, relative,                   \
+                             (void*)((l)->l_addr + relative->r_offset))
 #endif
 
 #ifndef VERSYMIDX
-# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
+# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX(sym))
 #endif
 
 #ifndef VALIDX
 # define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM    \
-                      + DT_EXTRANUM + DT_VALTAGIDX (tag))
+                      + DT_EXTRANUM + DT_VALTAGIDX(tag))
 #endif
 
 #define elf_dynamic_copy_rel        elf_dynamic_copy_rela

LibOS/shim/src/elf/rel.h

@@ -4,7 +4,7 @@
 #include "elf.h"
 
 #ifndef VERSYMIDX
-# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
+# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX(sym))
 #endif
 
 #ifndef DT_THISPROCNUM

LibOS/shim/src/fs/chroot/fs.c

@@ -59,8 +59,8 @@ struct mount_data {
     char                root_uri[];
 };
 
-#define HANDLE_MOUNT_DATA(h) ((struct mount_data *) (h)->fs->data)
-#define DENTRY_MOUNT_DATA(d) ((struct mount_data *) (d)->fs->data)
+#define HANDLE_MOUNT_DATA(h) ((struct mount_data*)(h)->fs->data)
+#define DENTRY_MOUNT_DATA(d) ((struct mount_data*)(d)->fs->data)
 
 static int chroot_mount (const char * uri, const char * root,
                          void ** mount_data)

LibOS/shim/src/shim_init.c

@@ -1210,7 +1210,7 @@ int message_confirm (const char * message, const char * options)
     }
 
 #define WRITE(buf, len)                                             \
-    ({  int _ret = DkStreamWrite(hdl, 0, len, (void *) buf, NULL);  \
+    ({  int _ret = DkStreamWrite(hdl, 0, len, (void*)(buf), NULL);  \
         _ret ? : -PAL_ERRNO; })
 
 #define READ(buf, len)                                              \

LibOS/shim/src/shim_parser.c

@@ -416,19 +416,19 @@ static inline int is_pointer (const char * type)
 
 #define PRINTF(fmt, ...)                            \
     do {                                            \
-        debug_printf((fmt), __VA_ARGS__);           \
+        debug_printf(fmt, __VA_ARGS__);             \
     } while (0)
 #define PUTS(str)                                   \
     do {                                            \
-        debug_puts((str));                          \
+        debug_puts(str);                            \
     } while (0)
 #define PUTCH(ch)                                   \
     do {                                            \
-        debug_putch((ch));                          \
+        debug_putch(ch);                            \
     } while (0)
 #define VPRINTF(fmt, ap)                            \
     do {                                            \
-        debug_vprintf((fmt), (ap));                 \
+        debug_vprintf(fmt, ap);                     \
     } while (0)
 
 static inline void parse_string_arg (va_list * ap)

LibOS/shim/src/sys/shim_open.c

@@ -380,14 +380,14 @@ size_t shim_do_getdents (int fd, struct linux_dirent * buf, size_t count)
             struct linux_dirent_tail * bt                               \
                     = (void *) b + sizeof(struct linux_dirent) + len + 1; \
                                                                         \
-            b->d_ino = dent->ino;                                       \
+            b->d_ino = (dent)->ino;                                     \
             b->d_off = ++dirhdl->offset;                                \
             b->d_reclen = DIRENT_SIZE(len);                             \
                                                                         \
             memcpy(b->d_name, name, len + 1);                           \
                                                                         \
             bt->pad = 0;                                                \
-            bt->d_type = type;                                          \
+            bt->d_type = (type);                                        \
                                                                         \
             b = (void *) bt + sizeof(struct linux_dirent_tail);         \
             bytes += DIRENT_SIZE(len);                                  \
@@ -481,10 +481,10 @@ size_t shim_do_getdents64 (int fd, struct linux_dirent64 * buf, size_t count)
             if (bytes + DIRENT_SIZE(len) > count)                       \
                 goto done;                                              \
                                                                         \
-            b->d_ino = dent->ino;                                       \
+            b->d_ino = (dent)->ino;                                     \
             b->d_off = ++dirhdl->offset;                                \
             b->d_reclen = DIRENT_SIZE(len);                             \
-            b->d_type = type;                                           \
+            b->d_type = (type);                                         \
                                                                         \
             memcpy(b->d_name, name, len + 1);                           \
                                                                         \

LibOS/shim/src/sys/shim_poll.c

@@ -104,7 +104,7 @@ struct poll_handle {
     struct poll_handle * children;
 } __attribute__((packed));
 
-#define POLL_NOTIMEOUT  ((unsigned long) -1)
+#define POLL_NOTIMEOUT  ((unsigned long)-1)
 
 static int __do_poll (int npolls, struct poll_handle * polls,
                       unsigned long timeout)
@@ -483,7 +483,7 @@ out:
 typedef long int __fd_mask;
 
 #ifndef __NFDBITS
-#define __NFDBITS    (8 * (int) sizeof (__fd_mask))
+#define __NFDBITS    (8 * (int)sizeof(__fd_mask))
 #endif
 #ifndef __FDS_BITS
 #define __FDS_BITS(set) ((set)->fds_bits)
@@ -500,14 +500,14 @@ typedef long int __fd_mask;
     } while (0)
 
 #define __FD_ELT(d)     ((d) / __NFDBITS)
-#define __FD_MASK(d)    ((__fd_mask) 1 << ((d) % __NFDBITS))
+#define __FD_MASK(d)    ((__fd_mask)1 << ((d) % __NFDBITS))
 
 #define __FD_SET(d, set)                                    \
-  ((void) (__FDS_BITS (set)[__FD_ELT (d)] |= __FD_MASK (d)))
+  ((void)(__FDS_BITS(set)[__FD_ELT(d)] |= __FD_MASK(d)))
 #define __FD_CLR(d, set)                                    \
-  ((void) (__FDS_BITS (set)[__FD_ELT (d)] &= ~__FD_MASK (d)))
+  ((void)(__FDS_BITS(set)[__FD_ELT(d)] &= ~__FD_MASK(d)))
 #define __FD_ISSET(d, set)                                  \
-  ((__FDS_BITS (set)[__FD_ELT (d)] & __FD_MASK (d)) != 0)
+  ((__FDS_BITS(set)[__FD_ELT(d)] & __FD_MASK(d)) != 0)
 
 DEFINE_PROFILE_CATAGORY(select, );
 DEFINE_PROFILE_INTERVAL(select_tryalloca_1, select);

LibOS/shim/test/native/clone.c

@@ -13,7 +13,7 @@
 #include <asm/prctl.h>
 
 // 64kB stack
-#define FIBER_STACK 1024 * 64
+#define FIBER_STACK (1024 * 64)
 
 __thread int mypid = 0;
 

LibOS/shim/test/native/multisleep.c

@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 #define SLEEP_TIME      10
-#define FIBER_STACK     1024 * 64
+#define FIBER_STACK     (1024 * 64)
 
 int proc;
 

LibOS/shim/test/regression/futex.c

@@ -15,7 +15,7 @@
 #include <assert.h>
 
 // 64kB stack
-#define FIBER_STACK 1024 * 64
+#define FIBER_STACK (1024 * 64)
 #define THREADS 2
 static int myfutex = 0;
 struct atomic_int {

Pal/include/elf/elf.h

@@ -62,7 +62,7 @@ typedef Elf64_Half Elf64_Versym;
 
 /* The ELF file header.  This appears at the start of every ELF file.  */
 
-#define EI_NIDENT (16)
+#define EI_NIDENT 16
 
 typedef struct
 {
@@ -477,7 +477,7 @@ typedef struct
 #define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
 
 /* For ELF64 the definitions are the same.  */
-#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
+#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY(o)
 
 /* Symbol visibility specification encoded in the st_other field.  */
 #define STV_DEFAULT	0		/* Default symbol visibility rules */

Pal/ipc/linux/graphene-ipc.c

@@ -44,13 +44,13 @@ struct kmem_cache *gipc_send_buffer_cachep;
 #  define DO_MMAP_PGOFF(file, addr, len, prot, flags, pgoff)		\
 	({								\
 		unsigned long populate;					\
-		unsigned long rv = do_mmap_pgoff((file), (addr), (len), \
-						 (prot), (flags),	\
-			 			 (pgoff), &populate);	\
+		unsigned long rv = do_mmap_pgoff(file, addr, len, 	\
+						 prot, flags,		\
+						 pgoff, &populate);	\
 	rv; })
 # else
 #  define DO_MMAP_PGOFF(file, addr, len, prot, flags, pgoff)		\
-	do_mmap_pgoff((file), (addr), (len), (prot), (flags), (pgoff))
+	do_mmap_pgoff(file, addr, len, prot, flags, pgoff)
 # endif /* kernel_version < 3.9.0 */
 #else
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
@@ -59,8 +59,8 @@ struct kmem_cache *gipc_send_buffer_cachep;
 	({								\
 		unsigned long populate;					\
 		unsigned long rv;					\
-	 	rv = KSYM(do_mmap)((file), (addr), (len),		\
-				   (prot), (flags), 0, (pgoff),		\
+		rv = KSYM(do_mmap)(file, addr, len,			\
+				   prot, flags, 0, pgoff,		\
 				   &populate, NULL);			\
 	rv; })
 
@@ -70,8 +70,8 @@ struct kmem_cache *gipc_send_buffer_cachep;
 	({								\
 		unsigned long populate;					\
 		unsigned long rv;					\
-	 	rv = KSYM(do_mmap)((file), (addr), (len),		\
-				   (prot), (flags), 0, (pgoff),		\
+		rv = KSYM(do_mmap)(file, addr, len,			\
+				   prot, flags, 0, pgoff,		\
 				   &populate);				\
 	rv; })
 # elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
@@ -80,14 +80,14 @@ struct kmem_cache *gipc_send_buffer_cachep;
 	({								\
 		unsigned long populate;					\
 		unsigned long rv;					\
-	 	rv = KSYM(do_mmap_pgoff)((file), (addr), (len),		\
-					 (prot), (flags), (pgoff),	\
+		rv = KSYM(do_mmap_pgoff)(file, addr, len,		\
+					 prot, flags, pgoff,		\
 					 &populate);			\
 	rv; })
 # else
 #  define MY_DO_MMAP_PGOFF
 #  define DO_MMAP_PGOFF(file, addr, len, prot, flags, pgoff)		\
-	KSYM(do_mmap_pgoff)((file), (addr), (len), (prot), (flags), (pgoff))
+	KSYM(do_mmap_pgoff)(file, addr, len, prot, flags, pgoff)
 # endif /* kernel version < 3.9 */
 #endif /* !CONFIG_GRAPHENE_BULK_IPC && kernel version > 3.4.0 */
 

Pal/lib/api.h

@@ -107,8 +107,8 @@ void *calloc(size_t nmemb, size_t size);
 
 /* copy static string and return the address of the null end (null if the dest
  * is not large enough).*/
-#define strcpy_static(var, str, max) \
-    (static_strlen(force_static(str)) + 1 > max ? NULL : \
+#define strcpy_static(var, str, max)                                          \
+    (static_strlen(force_static(str)) + 1 > (max) ? NULL :                    \
      memcpy((var), force_static(str), static_strlen(force_static(str)) + 1) + \
      static_strlen(force_static(str)))
 

Pal/lib/assert.h

@@ -12,7 +12,7 @@
 #ifndef ASSERT_H
 #define ASSERT_H
 
-#define COMPILE_TIME_ASSERT(pred) switch(0){case 0:case pred:;}
+#define COMPILE_TIME_ASSERT(pred) switch(0){case 0:case (pred):;}
 
 /* All environments should implement warn, which prints a non-optional debug
  * message. All environments should also implement __abort, which
@@ -24,13 +24,13 @@ void __abort(void);
 
 # define assert(test)                                                   \
     ({                                                                  \
-        long _val = (long) (test);                                      \
+        long _val = (long)(test);                                       \
         (!(_val))                                                       \
             ? ({                                                        \
                     warn("assert failed " __FILE__ ":%d " #test " (value:%x)\n", \
                          __LINE__, _val);                               \
                     __abort(); })                                       \
-            : (void) 0;                                                 \
+            : (void)0;                                                  \
     })
 
 #endif

Pal/lib/graphene/config.c

@@ -367,6 +367,14 @@ inval:
         *errstring = err;
 
     return -PAL_ERROR_INVAL;
+
+#undef CHECK_PTR
+#undef GOTO_INVAL
+#undef RANGE
+#undef IS_SKIP
+#undef IS_VALID
+#undef IS_BREAK
+#undef IS_SPACE
 }
 
 int free_config (struct config_store * store)

Pal/lib/hex.h

@@ -66,6 +66,6 @@ char * __bytes2hexstr(void * hex, size_t size, char *str, size_t len)
  * This buffer can only be used within the caller frame (function).
  */
 #define ALLOCA_BYTES2HEXSTR(array) \
-    (BYTES2HEXSTR((array), __alloca(sizeof(array) * 2 + 1), sizeof(array) * 2 + 1))
+    (BYTES2HEXSTR(array, __alloca(sizeof(array) * 2 + 1), sizeof(array) * 2 + 1))
 
 #endif // HEX_H

Pal/lib/slabmgr.h

@@ -170,7 +170,7 @@ typedef struct __attribute__((packed)) large_mem_obj {
 #define OBJ_RAW(obj) (&(obj)->raw)
 
 #define RAW_TO_LEVEL(raw_ptr) \
-            (*((const unsigned char *) (raw_ptr) - OBJ_PADDING - 1))
+            (*((const unsigned char*)(raw_ptr) - OBJ_PADDING - 1))
 #define RAW_TO_OBJ(raw_ptr, type) container_of((raw_ptr), type, raw)
 
 #define __SUM_OBJ_SIZE(slab_size, size) \
@@ -184,7 +184,7 @@ typedef struct __attribute__((packed)) large_mem_obj {
 #define __INIT_MIN_MEM_SIZE() \
             (sizeof(SLAB_MGR_TYPE) + sizeof(SLAB_AREA_TYPE) * SLAB_LEVEL)
 #define __INIT_MAX_MEM_SIZE(size) \
-            (__INIT_MIN_MEM_SIZE() + __INIT_SUM_OBJ_SIZE((size)))
+            (__INIT_MIN_MEM_SIZE() + __INIT_SUM_OBJ_SIZE(size))
 
 #ifdef PAGE_SIZE
 static inline int size_align_down(int slab_size, int size)

Pal/lib/string/memcmp.c

@@ -39,7 +39,7 @@
 #ifdef WORDS_BIGENDIAN
 # define CMP_LT_OR_GT(a, b) ((a) > (b) ? 1 : -1)
 #else
-# define CMP_LT_OR_GT(a, b) memcmp_bytes ((a), (b))
+# define CMP_LT_OR_GT(a, b) memcmp_bytes((a), (b))
 #endif
 
 /* BE VERY CAREFUL IF YOU CHANGE THIS CODE!  */

Pal/linux-kernel/graphene/graphene.c

@@ -194,7 +194,7 @@ static int graphene_lib_release(struct inode *inode, struct file *file)
 }
 #endif
 
-#define DEFINE_PATH_BUFFER(kpath, max) char * kpath; int max;
+#define DEFINE_PATH_BUFFER(kpath, max) char* kpath; int max;
 
 #define GET_PATH_BUFFER(kpath, max)					\
 	kpath = __getname();						\

Pal/linux-kernel/graphene/graphene.h

@@ -56,7 +56,7 @@ struct graphene_net_rule {
 	struct graphene_net_addr	addr;
 };
 
-#define GRAPHENE_SET_TASK	_IOW('k', 16, void *)
+#define GRAPHENE_SET_TASK _IOW('k', 16, void*)
 
 struct graphene_policies {
 	int				npolicies;

Pal/regression/Ipc.c

@@ -5,7 +5,7 @@
 #include "pal_debug.h"
 #include "api.h"
 
-#define UNIT pal_control.alloc_align
+#define UNIT (pal_control.alloc_align)
 
 static const char * volatile message = NULL;
 

Pal/regression/Memory.c

@@ -5,7 +5,7 @@
 #include "pal_debug.h"
 #include "api.h"
 
-#define UNIT pal_control.alloc_align
+#define UNIT (pal_control.alloc_align)
 
 static volatile int count = 0;
 

Pal/src/db_rtld.c

@@ -1293,7 +1293,7 @@ void * stack_before_call __attribute_unused = NULL;
                      "jmp *%1\r\n"                                      \
                      "1: movq stack_before_call(%%rip), %%rsp\r\n"      \
                                                                         \
-                     : "=a"(ret) : "a"(l->l_entry), "b"(cookies)        \
+                     : "=a"(ret) : "a"((l)->l_entry), "b"(cookies)      \
                      : "rcx", "rdx", "rdi", "rsi", "r8", "r9",          \
                        "r10", "r11", "memory", "cc");                   \
         ret; })

Pal/src/do-rel.h

@@ -30,7 +30,7 @@
 #include "dl-machine-x86_64.h"
 
 #define elf_dynamic_do_rel          elf_dynamic_do_rela
-#define RELCOUNT_IDX                VERSYMIDX (DT_RELACOUNT)
+#define RELCOUNT_IDX                VERSYMIDX(DT_RELACOUNT)
 #define Rel                         Rela
 #define elf_machine_rel             elf_machine_rela
 #define elf_machine_rel_relative    elf_machine_rela_relative

Pal/src/host/FreeBSD/db_exception.c

@@ -303,7 +303,7 @@ static bool _DkGenericSignalHandle (int event_num, siginfo_t * info,
 }
 
 #define ADDR_IN_PAL(addr) \
-        ((void *) (addr) > TEXT_START && (void *) (addr) < TEXT_END)
+        ((void*)(addr) > TEXT_START && (void*)(addr) < TEXT_END)
 
 static struct pal_frame * get_frame (ucontext_t * uc)
 {

Pal/src/host/FreeBSD/db_exception2.c

@@ -207,7 +207,7 @@ static bool _DkGenericSignalHandle (int event_num, siginfo_t * info,
 }
 
 #define ADDR_IN_PAL(addr) \
-        ((void *) (addr) > TEXT_START && (void *) (addr) < TEXT_END)
+        ((void*)(addr) > TEXT_START && (void*)(addr) < TEXT_END)
 
 /* This function walks the stack to find the PAL_FRAME
  * that was saved upon entry to the PAL, if an exception/interrupt

Pal/src/host/FreeBSD/db_main.c

@@ -286,13 +286,12 @@ static void cpuid (int cpuid_fd, unsigned int reg,
     (s)[3] = ((w) >> 24) & 0xff;
 
 #define BPI  32
-#define POWER2(power) \
-   (1ULL << (power))
+#define POWER2(power) (1ULL << (power))
 #define RIGHTMASK(width) \
-   (((unsigned long) (width) >= BPI) ? ~0ULL : POWER2(width)-1ULL)
+   (((unsigned long)(width) >= BPI) ? ~0ULL : POWER2(width) - 1ULL)
 
 #define BIT_EXTRACT_LE(value, start, after) \
-   (((unsigned long) (value) & RIGHTMASK(after)) >> start)
+   (((unsigned long)(value) & RIGHTMASK(after)) >> (start))
 
 
 static char * cpu_flags[]

Pal/src/host/FreeBSD/db_threading.c

@@ -85,7 +85,7 @@ int _DkThreadDelayExecution (unsigned long * duration)
     struct timespec sleeptime;
     struct timespec remainingtime;
 
-#define VERY_LONG_TIME_IN_US    (1000000L * 60 * 60 * 24 * 365 * 128)
+    const long VERY_LONG_TIME_IN_US = 1000000L * 60 * 60 * 24 * 365 * 128;
     if (*duration > VERY_LONG_TIME_IN_US) {
         /* avoid overflow with time_t */
         sleeptime.tv_sec  = VERY_LONG_TIME_IN_US / 1000000;

Pal/src/host/FreeBSD/include/sysdep.h

@@ -24,7 +24,7 @@
 #ifdef HAVE_ELF
 
 /* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-#define ALIGNARG(log2) 1<<log2
+#define ALIGNARG(log2) (1 << (log2))
 /* For ELF we need the `.type' directive to make shared libs work right.  */
 #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
 #define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
@@ -35,7 +35,7 @@
 
 #else
 
-#define ALIGNARG(log2) log2
+#define ALIGNARG(log2) (log2)
 #define ASM_TYPE_DIRECTIVE(name,type)	/* Nothing is specified.  */
 #define ASM_SIZE_DIRECTIVE(name)	/* Nothing is specified.  */
 

Pal/src/host/FreeBSD/pal_freebsd.h

@@ -75,12 +75,12 @@ extern struct pal_bsd_state {
             unsigned long flags;                                 \
             unsigned long fd;                                    \
             unsigned long offset;                                \
-        } args = {  .addr   = (unsigned long) (addr),            \
-                    .len    = (unsigned long) (len),             \
-                    .prot   = (unsigned long) (prot),            \
-                    .flags  = (unsigned long) (flags),           \
-                    .fd     = (unsigned long) (fd),              \
-                    .offset = (unsigned long) (offset), };       \
+        } args = {  .addr   = (unsigned long)(addr),             \
+                    .len    = (unsigned long)(len),              \
+                    .prot   = (unsigned long)(prot),             \
+                    .flags  = (unsigned long)(flags),            \
+                    .fd     = (unsigned long)(fd),               \
+                    .offset = (unsigned long)(offset), };        \
         INLINE_SYSCALL(mmap, 1, &args);                          \
     })
 # else
@@ -180,9 +180,9 @@ void init_child_process (PAL_HANDLE * parent, PAL_HANDLE * exec,
 void signal_setup (void);
 
 extern char __text_start, __text_end, __data_start, __data_end;
-#define TEXT_START (void *) (&__text_start)
-#define TEXT_END   (void *) (&__text_end)
-#define DATA_START (void *) (&__text_start)
-#define DATA_END   (void *) (&__text_end)
+#define TEXT_START ((void*)(&__text_start))
+#define TEXT_END   ((void*)(&__text_end))
+#define DATA_START ((void*)(&__text_start))
+#define DATA_END   ((void*)(&__text_end))
 
 #endif /* PAL_FREEBSD_H */

Pal/src/host/FreeBSD/pal_host.h

@@ -50,7 +50,7 @@ typedef struct mutex_handle {
 
 #define _DkInternalLock _DkMutexLock
 #define _DkInternalUnlock _DkMutexUnlock
-#define MAX_FDS         (3)
+#define MAX_FDS 3
 typedef union pal_handle
 {
     /* TSAI: Here we define the internal types of PAL_HANDLE
@@ -176,7 +176,7 @@ typedef union pal_handle
 #define WFD(n)          (00010 << (n))
 #define WRITEABLE(n)    (00100 << (n))
 #define ERROR(n)        (01000 << (n))
-#define HAS_FDS         (00077)
+#define HAS_FDS         00077
 
 #define HANDLE_TYPE(handle)  ((handle)->hdr.type)
 struct arch_frame {

Pal/src/host/FreeBSD/pal_security.h

@@ -72,7 +72,7 @@ extern struct pal_sec {
 } pal_sec;
 
 #define GRAPHENE_TEMPDIR        "/tmp/graphene"
-#define GRAPHENE_PIPEDIR        GRAPHENE_TEMPDIR "/pipes"
+#define GRAPHENE_PIPEDIR        (GRAPHENE_TEMPDIR "/pipes")
 
 #define PROC_INIT_FD    255
 

Pal/src/host/FreeBSD/sysdep-x86_64.h

@@ -33,7 +33,7 @@
 #ifdef __ASSEMBLER__
 
 /* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-#define ALIGNARG(log2) 1<<log2
+#define ALIGNARG(log2) (1 << (log2))
 #define ASM_GLOBAL_DIRECTIVE .global
 /* For ELF we need the `.type' directive to make shared libs work right.  */
 #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
@@ -119,15 +119,15 @@ To simplify matters and reuse a lot of the Linux code, we change rax to negative
           : "=b"(carry)                             \
           :                                         \
           : "cc", "memory", "eax");                 \
-     (carry) ? -val : val; })
+     (carry) ? -(val) : (val); })
 
 #define LOAD_ARGS_0()
 #define LOAD_REGS_0
 #define ASM_ARGS_0
 
 #define LOAD_ARGS_1(a1)                             \
-  long int __arg1 = (long) (a1);                    \
-  LOAD_ARGS_0 ()
+  long int __arg1 = (long)(a1);                     \
+  LOAD_ARGS_0()
 #define LOAD_REGS_1                                 \
   register long int _a1 asm ("rdi") = __arg1;       \
   LOAD_REGS_0
@@ -135,16 +135,16 @@ To simplify matters and reuse a lot of the Linux code, we change rax to negative
 #define ASM_ARGS_1    ASM_ARGS_0, "r" (_a1)
 
 #define LOAD_ARGS_2(a1, a2)                         \
-  long int __arg2 = (long) (a2);                    \
-  LOAD_ARGS_1 (a1)
+  long int __arg2 = (long)(a2);                     \
+  LOAD_ARGS_1(a1)
 #define LOAD_REGS_2                                 \
   register long int _a2 asm ("rsi") = __arg2;       \
   LOAD_REGS_1
 #define ASM_ARGS_2    ASM_ARGS_1, "r" (_a2)
 
 #define LOAD_ARGS_3(a1, a2, a3)                     \
-  long int __arg3 = (long) (a3);                    \
-  LOAD_ARGS_2 (a1, a2)
+  long int __arg3 = (long)(a3);                     \
+  LOAD_ARGS_2(a1, a2)
 #define LOAD_REGS_3                                 \
   register long int _a3 asm ("rdx") = __arg3;       \
   LOAD_REGS_2
@@ -152,24 +152,24 @@ To simplify matters and reuse a lot of the Linux code, we change rax to negative
 #define ASM_ARGS_3    ASM_ARGS_2, "r" (_a3)
 
 #define LOAD_ARGS_4(a1, a2, a3, a4)                 \
-  long int __arg4 = (long) (a4);                    \
-  LOAD_ARGS_3 (a1, a2, a3)
+  long int __arg4 = (long)(a4);                     \
+  LOAD_ARGS_3(a1, a2, a3)
 #define LOAD_REGS_4                                 \
   register long int _a4 asm ("rcx") = __arg4;       \
   LOAD_REGS_3
 #define ASM_ARGS_4    ASM_ARGS_3, "r" (_a4)
 
 #define LOAD_ARGS_5(a1, a2, a3, a4, a5)             \
-  long int __arg5 = (long) (a5);                    \
-  LOAD_ARGS_4 (a1, a2, a3, a4)
+  long int __arg5 = (long)(a5);                     \
+  LOAD_ARGS_4(a1, a2, a3, a4)
 #define LOAD_REGS_5                                 \
   register long int _a5 asm ("r8") = __arg5;        \
   LOAD_REGS_4
 #define ASM_ARGS_5    ASM_ARGS_4, "r" (_a5)
 
 #define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6)         \
-  long int __arg6 = (long) (a6);                    \
-  LOAD_ARGS_5 (a1, a2, a3, a4, a5)
+  long int __arg6 = (long)(a6);                     \
+  LOAD_ARGS_5(a1, a2, a3, a4, a5)
 #define LOAD_REGS_6                                 \
 register long int _a6 asm ("r9") = __arg6;          \
   LOAD_REGS_5

Pal/src/host/Linux-SGX/db_exception.c

@@ -73,7 +73,7 @@ _DkGenericSignalHandle (int event_num, PAL_NUM arg, struct pal_frame * frame,
 }
 
 #define ADDR_IN_PAL(addr)  \
-        ((void *) (addr) > TEXT_START && (void *) (addr) < TEXT_END)
+        ((void*)(addr) > TEXT_START && (void*)(addr) < TEXT_END)
 
 static struct pal_frame * get_frame (sgx_context_t * uc)
 {

Pal/src/host/Linux-SGX/db_main.c

@@ -416,10 +416,10 @@ static void cpuid (unsigned int leaf, unsigned int subleaf,
 #define POWER2(power) \
    (1ULL << (power))
 #define RIGHTMASK(width) \
-   (((unsigned long) (width) >= BPI) ? ~0ULL : POWER2(width)-1ULL)
+   (((unsigned long)(width) >= BPI) ? ~0ULL : POWER2(width) - 1ULL)
 
 #define BIT_EXTRACT_LE(value, start, after) \
-   (((unsigned long) (value) & RIGHTMASK(after)) >> start)
+   (((unsigned long)(value) & RIGHTMASK(after)) >> start)
 
 static char * cpu_flags[]
       = { "fpu",    // "x87 FPU on chip"

Pal/src/host/Linux-SGX/db_misc.c

@@ -84,7 +84,7 @@ int _DkSegmentRegisterGet (int reg, void ** addr)
 }
 
 #define CPUID_CACHE_SIZE    64
-#define CPUID_CACHE_INVALID ((unsigned int) -1)
+#define CPUID_CACHE_INVALID ((unsigned int)-1)
 
 static PAL_LOCK cpuid_cache_lock = LOCK_INIT;
 

Pal/src/host/Linux-SGX/enclave_ecalls.c

@@ -8,7 +8,7 @@
 
 #include "ecall_types.h"
 
-#define SGX_CAST(type, item) ((type) (item))
+#define SGX_CAST(type, item) ((type)(item))
 
 void pal_linux_main(char * uptr_args, uint64_t args_size,
                     char * uptr_env, uint64_t env_size,

Pal/src/host/Linux-SGX/include/sysdep.h

@@ -24,7 +24,7 @@
 #ifdef HAVE_ELF
 
 /* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-#define ALIGNARG(log2) 1<<log2
+#define ALIGNARG(log2) (1 << (log2))
 /* For ELF we need the `.type' directive to make shared libs work right.  */
 #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
 #define ASM_SIZE_DIRECTIVE(name) .size name,.-name;

Pal/src/host/Linux-SGX/linux_types.h

@@ -111,16 +111,15 @@ struct cmsghdr {
 # define SCM_RIGHTS 1
 #endif
 
-#define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1))
-#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
-#define CMSG_FIRSTHDR(mhdr) \
-  ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr)		      \
-   ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0)
+#define CMSG_DATA(cmsg) ((unsigned char*)((struct cmsghdr*)(cmsg) + 1))
+#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr(mhdr, cmsg)
+#define CMSG_FIRSTHDR(mhdr)                                             \
+  ((size_t)(mhdr)->msg_controllen >= sizeof(struct cmsghdr)             \
+   ? (struct cmsghdr*)(mhdr)->msg_control : (struct cmsghdr*)0)
 #define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
                          & (size_t) ~(sizeof (size_t) - 1))
-#define CMSG_SPACE(len) (CMSG_ALIGN (len) \
-                         + CMSG_ALIGN (sizeof (struct cmsghdr)))
-#define CMSG_LEN(len)   (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
+#define CMSG_SPACE(len) (CMSG_ALIGN(len) + CMSG_ALIGN(sizeof(struct cmsghdr)))
+#define CMSG_LEN(len)   (CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
 
 #include <linux/uio.h>
 

Pal/src/host/Linux-SGX/ocall_types.h

@@ -58,7 +58,7 @@ enum {
     OCALL_NR,
 };
 
-#define OCALL_NO_TIMEOUT   ((uint64_t) -1)
+#define OCALL_NO_TIMEOUT   ((uint64_t)-1)
 
 typedef struct {
     const char * ms_str;

Pal/src/host/Linux-SGX/pal_host.h

@@ -43,7 +43,7 @@ int _DkSpinUnlock (struct spinlock * lock);
 #define LOCK_INIT   { .value =  { 0 } }
 #define _DkInternalLock _DkSpinLock
 #define _DkInternalUnlock _DkSpinUnlock
-#define MAX_FDS           (3)
+#define MAX_FDS 3
 
 void * malloc_untrusted (int size);
 void free_untrusted (void * mem);
@@ -183,7 +183,7 @@ typedef struct pal_handle
 #define WFD(n)          (00010 << (n))
 #define WRITEABLE(n)    (00100 << (n))
 #define ERROR(n)        (01000 << (n))
-#define HAS_FDS         (00077)
+#define HAS_FDS         00077
 
 #define HANDLE_TYPE(handle)  ((handle)->hdr.type)
 
@@ -233,7 +233,7 @@ struct arch_frame {
 # error "unsupported architecture"
 #endif
 
-#define PAL_FRAME_IDENTIFIER    (0xdeaddeadbeefbeef)
+#define PAL_FRAME_IDENTIFIER 0xdeaddeadbeefbeef
 
 struct pal_frame {
     volatile uint64_t           identifier;

Pal/src/host/Linux-SGX/pal_linux.h

@@ -97,10 +97,10 @@ int * get_futex (void);
 void free_futex (int * futex);
 
 extern char __text_start, __text_end, __data_start, __data_end;
-#define TEXT_START (void *) (&__text_start)
-#define TEXT_END   (void *) (&__text_end)
-#define DATA_START (void *) (&__text_start)
-#define DATA_END   (void *) (&__text_end)
+#define TEXT_START ((void*)(&__text_start))
+#define TEXT_END   ((void*)(&__text_end))
+#define DATA_START ((void*)(&__text_start))
+#define DATA_END   ((void*)(&__text_end))
 
 typedef struct { char bytes[32]; } sgx_checksum_t;
 typedef struct { char bytes[16]; } sgx_stub_t;

Pal/src/host/Linux-SGX/pal_linux_defs.h

@@ -4,28 +4,28 @@
 #ifndef PAL_LINUX_DEFS_H
 #define PAL_LINUX_DEFS_H
 
-#define ENCLAVE_HIGH_ADDRESS    (0x800000000)
-#define SSAFRAMENUM         (2)
-#define MEMORY_GAP          (PRESET_PAGESIZE)
+#define ENCLAVE_HIGH_ADDRESS    0x800000000
+#define SSAFRAMENUM         2
+#define MEMORY_GAP          PRESET_PAGESIZE
 #define ENCLAVE_STACK_SIZE  (PRESET_PAGESIZE * 16)
-#define DEAFULT_HEAP_MIN    (0x10000)
-#define TRACE_ECALL         (1)
-#define TRACE_OCALL         (1)
+#define DEAFULT_HEAP_MIN    0x10000
+#define TRACE_ECALL         1
+#define TRACE_OCALL         1
 
-#define DEBUG_ECALL         (0)
-#define DEBUG_OCALL         (0)
+#define DEBUG_ECALL         0
+#define DEBUG_OCALL         0
 
 #define TRUSTED_STUB_SIZE   (PRESET_PAGESIZE * 4)
 
-#define CACHE_FILE_STUBS    (1)
+#define CACHE_FILE_STUBS    1
 
-//#define USE_AES_NI          (1)
+//#define USE_AES_NI          1
 
-#define PRINT_ENCLAVE_STAT  (0)
+#define PRINT_ENCLAVE_STAT  0
 
-#define MAX_ARGS_SIZE       (10000000)
-#define MAX_ENV_SIZE        (10000000)
+#define MAX_ARGS_SIZE       10000000
+#define MAX_ENV_SIZE        10000000
 
-#define RED_ZONE_SIZE       (128)
+#define RED_ZONE_SIZE       128
 
 #endif /* PAL_LINUX_DEFS_H */

Pal/src/host/Linux-SGX/pal_security.h

@@ -66,7 +66,7 @@ extern struct pal_sec pal_sec;
 #endif
 
 #define GRAPHENE_TEMPDIR        "/tmp/graphene"
-#define GRAPHENE_PIPEDIR        GRAPHENE_TEMPDIR "/pipes"
+#define GRAPHENE_PIPEDIR        (GRAPHENE_TEMPDIR "/pipes")
 
 #define PROC_INIT_FD    255
 

Pal/src/host/Linux-SGX/sgx_arch.h

@@ -30,7 +30,7 @@ typedef uint8_t sgx_arch_key_t [384];
 typedef uint8_t sgx_arch_hash_t[32];
 typedef uint8_t sgx_arch_mac_t [16];
 // This if for passing a mac to hex2str
-#define MACBUF_SIZE ((sizeof(sgx_arch_mac_t)*2)+1)
+#define MACBUF_SIZE ((sizeof(sgx_arch_mac_t) * 2) + 1)
 
 typedef struct {
     uint64_t flags, xfrm;

Pal/src/host/Linux-SGX/sgx_enclave.c

@@ -596,7 +596,7 @@ static int sgx_ocall_sleep(void * pms)
     }
     struct timespec req, rem;
     unsigned long microsec = ms->ms_microsec;
-#define VERY_LONG_TIME_IN_US    (1000000L * 60 * 60 * 24 * 365 * 128)
+    const long VERY_LONG_TIME_IN_US = 1000000L * 60 * 60 * 24 * 365 * 128;
     if (ms->ms_microsec > VERY_LONG_TIME_IN_US) {
         /* avoid overflow with time_t */
         req.tv_sec  = VERY_LONG_TIME_IN_US / 1000000;

Pal/src/host/Linux-SGX/sgx_exception.c

@@ -62,7 +62,7 @@
 #endif
 
 #define DEFINE_RESTORE_RT(syscall) DEFINE_RESTORE_RT2(syscall)
-# define DEFINE_RESTORE_RT2(syscall)                \
+#define DEFINE_RESTORE_RT2(syscall)                 \
     __asm__ (                                       \
          "    nop\n"                                \
          ".align 16\n"                              \

Pal/src/host/Linux-SGX/sgx_internal.h

@@ -51,11 +51,11 @@ extern unsigned long pagesize, pageshift, pagemask;
 #undef ALLOC_ALIGNED
 
 #define ALLOC_ALIGNDOWN(addr) \
-    (pagesize ? ((unsigned long) (addr)) & pagemask : (unsigned long) (addr))
+    (pagesize ? ((unsigned long)(addr)) & pagemask : (unsigned long)(addr))
 #define ALLOC_ALIGNUP(addr) \
-    (pagesize ? (((unsigned long) (addr)) + pageshift) & pagemask : (unsigned long) (addr))
+    (pagesize ? (((unsigned long)(addr)) + pageshift) & pagemask : (unsigned long)(addr))
 #define ALLOC_ALIGNED(addr) \
-    (pagesize && ((unsigned long) (addr)) == (((unsigned long) (addr)) & pagemask))
+    (pagesize && ((unsigned long)(addr)) == (((unsigned long)(addr)) & pagemask))
 
 uint32_t htonl (uint32_t longval);
 uint16_t htons (uint16_t shortval);

Pal/src/host/Linux-SGX/sgx_main.c

@@ -241,7 +241,7 @@ int initialize_enclave (struct pal_enclave * enclave)
 
 #define TRY(func, ...)                                              \
     ({                                                              \
-        ret = func(__VA_ARGS__);                                    \
+        ret = (func)(__VA_ARGS__);                                  \
         if (ret < 0) {                                              \
             SGX_DBG(DBG_E, "initializing enclave failed: " #func ": %d\n",  \
                    -ret);                                           \
@@ -321,14 +321,14 @@ int initialize_enclave (struct pal_enclave * enclave)
 #define SET_AREA(_desc, _skip_eextend, _is_binary, _fd, _addr, _size, _prot, _type) \
     ({                                                   \
         struct mem_area* _a = &areas[area_num++];        \
-        _a->desc            = _desc;                     \
-        _a->skip_eextend    = _skip_eextend;             \
-        _a->is_binary       = _is_binary;                \
-        _a->fd              = _fd;                       \
-        _a->addr            = _addr;                     \
-        _a->size            = _size;                     \
-        _a->prot            = _prot;                     \
-        _a->type            = _type;                     \
+        _a->desc            = (_desc);                   \
+        _a->skip_eextend    = (_skip_eextend);           \
+        _a->is_binary       = (_is_binary);              \
+        _a->fd              = (_fd);                     \
+        _a->addr            = (_addr);                   \
+        _a->size            = (_size);                   \
+        _a->prot            = (_prot);                   \
+        _a->type            = (_type);                   \
         _a;                                              \
     })
 

Pal/src/host/Linux-SGX/sysdep-x86_64.h

@@ -50,7 +50,7 @@
 #ifdef __ASSEMBLER__
 
 /* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-#define ALIGNARG(log2) 1<<log2
+#define ALIGNARG(log2) (1 << (log2))
 #define ASM_GLOBAL_DIRECTIVE .global
 /* For ELF we need the `.type' directive to make shared libs work right.  */
 #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
@@ -173,48 +173,48 @@
 #define ASM_ARGS_0
 
 #define LOAD_ARGS_1(a1)                                 \
-  long int __arg1 = (long) (a1);                        \
-  LOAD_ARGS_0 ()
+  long int __arg1 = (long)(a1);                         \
+  LOAD_ARGS_0()
 #define LOAD_REGS_1                                     \
   register long int _a1 __asm__ ("rdi") = __arg1;       \
   LOAD_REGS_0
 #define ASM_ARGS_1    ASM_ARGS_0, "r" (_a1)
 
 #define LOAD_ARGS_2(a1, a2)                             \
-  long int __arg2 = (long) (a2);                        \
-  LOAD_ARGS_1 (a1)
+  long int __arg2 = (long)(a2);                         \
+  LOAD_ARGS_1(a1)
 #define LOAD_REGS_2                                     \
   register long int _a2 __asm__ ("rsi") = __arg2;       \
   LOAD_REGS_1
 #define ASM_ARGS_2    ASM_ARGS_1, "r" (_a2)
 
 #define LOAD_ARGS_3(a1, a2, a3)                         \
-  long int __arg3 = (long) (a3);                        \
-  LOAD_ARGS_2 (a1, a2)
+  long int __arg3 = (long)(a3);                         \
+  LOAD_ARGS_2(a1, a2)
 #define LOAD_REGS_3                                     \
   register long int _a3 __asm__ ("rdx") = __arg3;       \
   LOAD_REGS_2
 #define ASM_ARGS_3    ASM_ARGS_2, "r" (_a3)
 
 #define LOAD_ARGS_4(a1, a2, a3, a4)                     \
-  long int __arg4 = (long) (a4);                        \
-  LOAD_ARGS_3 (a1, a2, a3)
+  long int __arg4 = (long)(a4);                         \
+  LOAD_ARGS_3(a1, a2, a3)
 #define LOAD_REGS_4                                     \
   register long int _a4 __asm__ ("r10") = __arg4;       \
   LOAD_REGS_3
 #define ASM_ARGS_4    ASM_ARGS_3, "r" (_a4)
 
 #define LOAD_ARGS_5(a1, a2, a3, a4, a5)                 \
-  long int __arg5 = (long) (a5);                        \
-  LOAD_ARGS_4 (a1, a2, a3, a4)
+  long int __arg5 = (long)(a5);                         \
+  LOAD_ARGS_4(a1, a2, a3, a4)
 #define LOAD_REGS_5                                     \
   register long int _a5 __asm__ ("r8") = __arg5;        \
   LOAD_REGS_4
 #define ASM_ARGS_5    ASM_ARGS_4, "r" (_a5)
 
 #define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6)             \
-  long int __arg6 = (long) (a6);                        \
-  LOAD_ARGS_5 (a1, a2, a3, a4, a5)
+  long int __arg6 = (long)(a6);                         \
+  LOAD_ARGS_5(a1, a2, a3, a4, a5)
 #define LOAD_REGS_6                                     \
   register long int _a6 __asm__ ("r9") = __arg6;        \
   LOAD_REGS_5

Pal/src/host/Linux/db_exception.c

@@ -59,7 +59,7 @@
 #endif
 
 #define DEFINE_RESTORE_RT(syscall) DEFINE_RESTORE_RT2(syscall)
-# define DEFINE_RESTORE_RT2(syscall)                \
+#define DEFINE_RESTORE_RT2(syscall)                 \
     __asm__ (                                       \
          "    nop\n"                                \
          ".align 16\n"                              \

Pal/src/host/Linux/db_main.c

@@ -342,10 +342,10 @@ void cpuid (unsigned int leaf, unsigned int subleaf,
 #define POWER2(power) \
    (1ULL << (power))
 #define RIGHTMASK(width) \
-   (((unsigned long) (width) >= BPI) ? ~0ULL : POWER2(width)-1ULL)
+   (((unsigned long)(width) >= BPI) ? ~0ULL : POWER2(width) - 1ULL)
 
 #define BIT_EXTRACT_LE(value, start, after) \
-   (((unsigned long) (value) & RIGHTMASK(after)) >> start)
+   (((unsigned long)(value) & RIGHTMASK(after)) >> start)
 
 static char * cpu_flags[]
       = { "fpu",    // "x87 FPU on chip"

Pal/src/host/Linux/db_threading.c

@@ -139,7 +139,7 @@ int _DkThreadDelayExecution (unsigned long * duration)
     struct timespec sleeptime;
     struct timespec remainingtime;
 
-#define VERY_LONG_TIME_IN_US    (1000000L * 60 * 60 * 24 * 365 * 128)
+    const long VERY_LONG_TIME_IN_US = 1000000L * 60 * 60 * 24 * 365 * 128;
     if (*duration > VERY_LONG_TIME_IN_US) {
         /* avoid overflow with time_t */
         sleeptime.tv_sec  = VERY_LONG_TIME_IN_US / 1000000;

Pal/src/host/Linux/pal_host.h

@@ -48,10 +48,10 @@ typedef struct mutex_handle {
 
 /* Initializer of Mutexes */
 #define MUTEX_HANDLE_INIT    { .locked = 0, .nwaiters.counter = 0 }
-#define INIT_MUTEX_HANDLE(m)  do { m->locked = 0; atomic_set(&m->nwaiters, 0); } while (0)
+#define INIT_MUTEX_HANDLE(m)  do { (m)->locked = 0; atomic_set(&(m)->nwaiters, 0); } while (0)
 
 #define LOCK_INIT MUTEX_HANDLE_INIT
-#define INIT_LOCK(lock) INIT_MUTEX_HANDLE(lock);
+#define INIT_LOCK(lock) INIT_MUTEX_HANDLE(lock)
 
 /* Locking and unlocking of Mutexes */
 int _DkMutexLock (struct mutex_handle * mut);
@@ -70,7 +70,7 @@ typedef struct {
 #endif
 } PAL_RESERVED_HDR;
 
-#define MAX_FDS         (3)
+#define MAX_FDS 3
 
 typedef struct pal_handle
 {
@@ -184,7 +184,7 @@ typedef struct pal_handle
 #define WFD(n)          (00010 << (n))
 #define WRITEABLE(n)    (00100 << (n))
 #define ERROR(n)        (01000 << (n))
-#define HAS_FDS         (00077)
+#define HAS_FDS         00077
 
 #define HANDLE_TYPE(handle)  ((handle)->hdr.type)
 

Pal/src/host/Linux/pal_linux.h

@@ -87,17 +87,17 @@ extern struct pal_linux_state {
             unsigned long flags;                                 \
             unsigned long fd;                                    \
             unsigned long offset;                                \
-        } args = {  .addr   = (unsigned long) (addr),            \
-                    .len    = (unsigned long) (len),             \
-                    .prot   = (unsigned long) (prot),            \
-                    .flags  = (unsigned long) (flags),           \
-                    .fd     = (unsigned long) (fd),              \
-                    .offset = (unsigned long) (offset), };       \
+        } args = {  .addr   = (unsigned long)(addr),             \
+                    .len    = (unsigned long)(len),              \
+                    .prot   = (unsigned long)(prot),             \
+                    .flags  = (unsigned long)(flags),            \
+                    .fd     = (unsigned long)(fd),               \
+                    .offset = (unsigned long)(offset), };        \
         INLINE_SYSCALL(mmap, 1, &args);                          \
     })
 # else
 #  define ARCH_MMAP(addr, len, prot, flags, fd, offset) \
-    INLINE_SYSCALL(mmap, 6, (addr), (len), (prot), (flags), (fd), (offset))
+    INLINE_SYSCALL(mmap, 6, addr, len, prot, flags, fd, offset)
 # endif
 #else
 # error "INLINE_SYSCALL not supported"
@@ -170,13 +170,13 @@ void signal_setup (void);
 unsigned long _DkSystemTimeQueryEarly (void);
 
 extern char __text_start, __text_end, __data_start, __data_end;
-#define TEXT_START (void *) (&__text_start)
-#define TEXT_END   (void *) (&__text_end)
-#define DATA_START (void *) (&__text_start)
-#define DATA_END   (void *) (&__text_end)
+#define TEXT_START ((void*)(&__text_start))
+#define TEXT_END   ((void*)(&__text_end))
+#define DATA_START ((void*)(&__text_start))
+#define DATA_END   ((void*)(&__text_end))
 
 #define ADDR_IN_PAL(addr) \
-        ((void *) (addr) > TEXT_START && (void *) (addr) < TEXT_END)
+        ((void*)(addr) > TEXT_START && (void*)(addr) < TEXT_END)
 
 DEFINE_LIST(event_queue);
 struct event_queue {

Pal/src/host/Linux/pal_linux_defs.h

@@ -8,7 +8,7 @@
 #define USER_ADDRESS_LOWEST     0x10000
 
 #define THREAD_STACK_SIZE       (PRESET_PAGESIZE * 2)
-#define ALT_STACK_SIZE          (PRESET_PAGESIZE)
+#define ALT_STACK_SIZE          PRESET_PAGESIZE
 
 /* internal wrap native pipe inside pipe streams */
 #define USE_PIPE_SYSCALL        0

Pal/src/host/Linux/sysdep-x86_64.h

@@ -50,7 +50,7 @@
 #ifdef __ASSEMBLER__
 
 /* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-#define ALIGNARG(log2) 1<<log2
+#define ALIGNARG(log2) (1 << (log2))
 #define ASM_GLOBAL_DIRECTIVE .global
 /* For ELF we need the `.type' directive to make shared libs work right.  */
 #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
@@ -173,7 +173,7 @@
 #define ASM_ARGS_0
 
 #define LOAD_ARGS_1(a1)                                 \
-  long int __arg1 = (long) (a1);                        \
+  long int __arg1 = (long)(a1);                         \
   LOAD_ARGS_0 ()
 #define LOAD_REGS_1                                     \
   register long int _a1 __asm__ ("rdi") = __arg1;       \
@@ -181,7 +181,7 @@
 #define ASM_ARGS_1    ASM_ARGS_0, "r" (_a1)
 
 #define LOAD_ARGS_2(a1, a2)                             \
-  long int __arg2 = (long) (a2);                        \
+  long int __arg2 = (long)(a2);                         \
   LOAD_ARGS_1 (a1)
 #define LOAD_REGS_2                                     \
   register long int _a2 __asm__ ("rsi") = __arg2;       \
@@ -189,7 +189,7 @@
 #define ASM_ARGS_2    ASM_ARGS_1, "r" (_a2)
 
 #define LOAD_ARGS_3(a1, a2, a3)                         \
-  long int __arg3 = (long) (a3);                        \
+  long int __arg3 = (long)(a3);                         \
   LOAD_ARGS_2 (a1, a2)
 #define LOAD_REGS_3                                     \
   register long int _a3 __asm__ ("rdx") = __arg3;       \
@@ -197,7 +197,7 @@
 #define ASM_ARGS_3    ASM_ARGS_2, "r" (_a3)
 
 #define LOAD_ARGS_4(a1, a2, a3, a4)                     \
-  long int __arg4 = (long) (a4);                        \
+  long int __arg4 = (long)(a4);                         \
   LOAD_ARGS_3 (a1, a2, a3)
 #define LOAD_REGS_4                                     \
   register long int _a4 __asm__ ("r10") = __arg4;       \
@@ -205,7 +205,7 @@
 #define ASM_ARGS_4    ASM_ARGS_3, "r" (_a4)
 
 #define LOAD_ARGS_5(a1, a2, a3, a4, a5)                 \
-  long int __arg5 = (long) (a5);                        \
+  long int __arg5 = (long)(a5);                         \
   LOAD_ARGS_4 (a1, a2, a3, a4)
 #define LOAD_REGS_5                                     \
   register long int _a5 __asm__ ("r8") = __arg5;        \
@@ -213,7 +213,7 @@
 #define ASM_ARGS_5    ASM_ARGS_4, "r" (_a5)
 
 #define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6)             \
-  long int __arg6 = (long) (a6);                        \
+  long int __arg6 = (long)(a6);                         \
   LOAD_ARGS_5 (a1, a2, a3, a4, a5)
 #define LOAD_REGS_6                                     \
   register long int _a6 __asm__ ("r9") = __arg6;        \

Pal/src/host/Skeleton/pal_host.h

@@ -31,8 +31,8 @@
 #endif
 
 typedef int PAL_LOCK;
-#define LOCK_INIT   (0)
-#define MAX_FDS     (3)
+#define LOCK_INIT   0
+#define MAX_FDS     3
 
 typedef struct pal_handle
 {

Pal/src/pal.h

@@ -464,7 +464,7 @@ DkEventSet (PAL_HANDLE eventHandle);
 void
 DkEventClear (PAL_HANDLE eventHandle);
 
-#define NO_TIMEOUT      ((PAL_NUM) -1)
+#define NO_TIMEOUT ((PAL_NUM)-1)
 
 /* assuming timeout to be in microseconds
  * NO_TIMEOUT means no timeout, as the name implies.

Pal/src/pal_internal.h

@@ -244,12 +244,12 @@ extern struct pal_internal_state {
 extern PAL_CONTROL __pal_control;
 
 #define ALLOC_ALIGNDOWN(addr)                               \
-        (((unsigned long) (addr)) & pal_state.alloc_mask)
+        (((unsigned long)(addr)) & pal_state.alloc_mask)
 #define ALLOC_ALIGNUP(addr)                                 \
-        ((((unsigned long) (addr)) + pal_state.alloc_shift) & pal_state.alloc_mask)
+        ((((unsigned long)(addr)) + pal_state.alloc_shift) & pal_state.alloc_mask)
 #define ALLOC_ALIGNED(addr)                                 \
-        ((unsigned long) (addr) ==                          \
-            (((unsigned long) (addr)) & pal_state.alloc_mask))
+        ((unsigned long)(addr) ==                           \
+            (((unsigned long)(addr)) & pal_state.alloc_mask))
 
 /* Main initialization function */
 void pal_main (

Pal/src/pal_rtld.h

@@ -132,16 +132,16 @@ ELF_PREFERRED_ADDRESS_DATA;
 #endif
 
 #ifndef ELF_FIXED_ADDRESS
-# define ELF_FIXED_ADDRESS(loader, mapstart) ((void) 0)
+# define ELF_FIXED_ADDRESS(loader, mapstart) ((void)0)
 #endif
 
 #ifndef VERSYMIDX
-# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
+# define VERSYMIDX(sym) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX(sym))
 #endif
 
 #ifndef VALIDX
 # define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-                      + DT_EXTRANUM + DT_VALTAGIDX (tag))
+                      + DT_EXTRANUM + DT_VALTAGIDX(tag))
 #endif
 
 #include <host_endian.h>

Pal/src/security/Linux/bpf-helper.h

@@ -56,17 +56,17 @@ void seccomp_bpf_print(struct sock_filter *filter, int count);
 #define DENY \
 	BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL)
 #define JUMP(labels, label) \
-	BPF_JUMP(BPF_JMP+BPF_JA, FIND_LABEL((labels), (label)), \
+	BPF_JUMP(BPF_JMP+BPF_JA, FIND_LABEL(labels, label), \
 		 JUMP_JT, JUMP_JF)
 #define LABEL(labels, label) \
-	BPF_JUMP(BPF_JMP+BPF_JA, FIND_LABEL((labels), (label)), \
+	BPF_JUMP(BPF_JMP+BPF_JA, FIND_LABEL(labels, label), \
 		 LABEL_JT, LABEL_JF)
 #define SYSCALL(nr, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (nr), 0, 1), \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, nr, 0, 1), \
 	jt
 
 /* Lame, but just an example */
-#define FIND_LABEL(labels, label) seccomp_bpf_label((labels), #label)
+#define FIND_LABEL(labels, label) seccomp_bpf_label(labels, #label)
 
 #define EXPAND(...) __VA_ARGS__
 
@@ -74,10 +74,10 @@ void seccomp_bpf_print(struct sock_filter *filter, int count);
 #define HI_FLAG(flag) ((flag >> sizeof(__u32)) & ((1 << sizeof(__u32)) - 1))
 /* Ensure that we load the logically correct offset. */
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-#define LO_ARG(idx) offsetof(struct seccomp_data, args[(idx)])
+#define LO_ARG(idx) offsetof(struct seccomp_data, args[idx])
 #define LO_IP offsetof(struct seccomp_data, instruction_pointer)
 #elif __BYTE_ORDER == __BIG_ENDIAN
-#define LO_ARG(idx) offsetof(struct seccomp_data, args[(idx)]) + sizeof(__u32)
+#define LO_ARG(idx) offsetof(struct seccomp_data, args[idx]) + sizeof(__u32)
 #define LO_IP offsetof(struct seccomp_data, instruction_pointer) + sizeof(__u32)
 #else
 #error "Unknown endianness"
@@ -101,11 +101,11 @@ void seccomp_bpf_print(struct sock_filter *filter, int count);
 /* Ensure that we load the logically correct offset. */
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define ENDIAN(_lo, _hi) _lo, _hi
-#define HI_ARG(idx) offsetof(struct seccomp_data, args[(idx)]) + sizeof(__u32)
+#define HI_ARG(idx) offsetof(struct seccomp_data, args[idx]) + sizeof(__u32)
 #define HI_IP offsetof(struct seccomp_data, instruction_pointer) + sizeof(__u32)
 #elif __BYTE_ORDER == __BIG_ENDIAN
 #define ENDIAN(_lo, _hi) _hi, _lo
-#define HI_ARG(idx) offsetof(struct seccomp_data, args[(idx)])
+#define HI_ARG(idx) offsetof(struct seccomp_data, args[idx])
 #define HI_IP offsetof(struct seccomp_data, instruction_pointer)
 #endif
 
@@ -186,94 +186,94 @@ union arg64 {
 	BPF_STMT(BPF_ST, 1) /* hi -> M[1] */
 
 #define JEQ32(value, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (value), 0, 1), \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, value, 0, 1), \
 	jt
 
 #define JNE32(value, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (value), 1, 0), \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, value, 1, 0), \
 	jt
 
 /* Checks the lo, then swaps to check the hi. A=lo,X=hi */
 #define JEQ64(lo, hi, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (hi), 0, 5), \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, hi, 0, 5),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 0), /* swap in lo */ \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (lo), 0, 2), \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, lo, 0, 2),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 1), /* passed: swap hi back in */ \
-	jt, \
+	jt,                                           \
 	BPF_STMT(BPF_LD+BPF_MEM, 1) /* failed: swap hi back in */
 
 #define JNE64(lo, hi, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (hi), 5, 0), \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, hi, 5, 0),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 0), /* swap in lo */ \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (lo), 2, 0), \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, lo, 2, 0),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 1), /* passed: swap hi back in */ \
-	jt, \
+	jt,                                           \
 	BPF_STMT(BPF_LD+BPF_MEM, 1) /* failed: swap hi back in */
 
 #define JA32(value, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, (value), 0, 1), \
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, value, 0, 1), \
 	jt
 
 #define JA64(lo, hi, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, (hi), 3, 0), \
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, hi, 3, 0),   \
 	BPF_STMT(BPF_LD+BPF_MEM, 0), /* swap in lo */ \
-	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, (lo), 0, 2), \
+	BPF_JUMP(BPF_JMP+BPF_JSET+BPF_K, lo, 0, 2),   \
 	BPF_STMT(BPF_LD+BPF_MEM, 1), /* passed: swap hi back in */ \
-	jt, \
+	jt,                                           \
 	BPF_STMT(BPF_LD+BPF_MEM, 1) /* failed: swap hi back in */
 
 #define JGE32(value, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, (value), 0, 1), \
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, value, 0, 1), \
 	jt
 
 #define JLT32(value, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, (value), 1, 0), \
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, value, 1, 0), \
 	jt
 
 /* Shortcut checking if hi > arg.hi. */
 #define JGE64(lo, hi, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, (hi), 4, 0), \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (hi), 0, 5), \
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, hi, 4, 0),    \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, hi, 0, 5),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 0), /* swap in lo */ \
-	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, (lo), 0, 2), \
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, lo, 0, 2),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 1), /* passed: swap hi back in */ \
-	jt, \
+	jt,                                           \
 	BPF_STMT(BPF_LD+BPF_MEM, 1) /* failed: swap hi back in */
 
 #define JLT64(lo, hi, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, (hi), 0, 4), \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (hi), 0, 5), \
+	BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, hi, 0, 4),    \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, hi, 0, 5),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 0), /* swap in lo */ \
-	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, (lo), 2, 0), \
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, lo, 2, 0),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 1), /* passed: swap hi back in */ \
-	jt, \
+	jt,                                           \
 	BPF_STMT(BPF_LD+BPF_MEM, 1) /* failed: swap hi back in */
 
 #define JGT32(value, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, (value), 0, 1), \
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, value, 0, 1), \
 	jt
 
 #define JLE32(value, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, (value), 1, 0), \
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, value, 1, 0), \
 	jt
 
 /* Check hi > args.hi first, then do the GE checking */
 #define JGT64(lo, hi, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, (hi), 4, 0), \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (hi), 0, 5), \
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, hi, 4, 0),    \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, hi, 0, 5),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 0), /* swap in lo */ \
-	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, (lo), 0, 2), \
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, lo, 0, 2),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 1), /* passed: swap hi back in */ \
-	jt, \
+	jt,                                           \
 	BPF_STMT(BPF_LD+BPF_MEM, 1) /* failed: swap hi back in */
 
 #define JLE64(lo, hi, jt) \
-	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, (hi), 6, 0), \
-	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, (hi), 0, 3), \
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, hi, 6, 0),    \
+	BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, hi, 0, 3),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 0), /* swap in lo */ \
-	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, (lo), 2, 0), \
+	BPF_JUMP(BPF_JMP+BPF_JGT+BPF_K, lo, 2, 0),    \
 	BPF_STMT(BPF_LD+BPF_MEM, 1), /* passed: swap hi back in */ \
-	jt, \
+	jt,                                           \
 	BPF_STMT(BPF_LD+BPF_MEM, 1) /* failed: swap hi back in */
 
 #define LOAD_SYSCALL_NR \

Pal/src/security/Linux/internal.h

@@ -13,7 +13,7 @@
 /* RUNTIME_FILE() is defined in pal_internal.h, and including pal_internal.h
  * causes compile issue. So PAL_LOADER is defined without RUNTIME_FILE
  * as workaround. */
-#define PAL_LOADER  XSTRINGIFY(RUNTIME_DIR)"/pal-Linux"
+#define PAL_LOADER  XSTRINGIFY(RUNTIME_DIR) "/pal-Linux"
 
 #ifdef __x86_64__
 # include "sysdep-x86_64.h"

Pal/src/security/Linux/main.c

@@ -23,13 +23,13 @@
 #include "internal.h"
 #include "graphene.h"
 
-#define PRESET_PAGESIZE  (4096UL)
+#define PRESET_PAGESIZE 4096UL
 
 unsigned long pagesize  = PRESET_PAGESIZE;
 unsigned long pageshift = PRESET_PAGESIZE - 1;
 unsigned long pagemask  = ~(PRESET_PAGESIZE - 1);
 
-# define POOL_SIZE 4096 * 64
+#define POOL_SIZE (4096 * 64)
 static char mem_pool[POOL_SIZE];
 static char *bump = mem_pool;
 static char *mem_pool_end = &mem_pool[POOL_SIZE];

Pal/src/security/Linux/printf.c

@@ -28,7 +28,7 @@ struct sprintbuf {
 	int cnt;
 };
 
-#define sys_cputs(fd, bf, cnt) INLINE_SYSCALL(write, 3, (fd), (bf), (cnt))
+#define sys_cputs(fd, bf, cnt) INLINE_SYSCALL(write, 3, fd, bf, cnt)
 
 static int
 fputch(int fd, int ch, struct printbuf *b)

Pal/src/slab.c

@@ -44,7 +44,7 @@ static char mem_pool[POOL_SIZE];
 static void *bump = mem_pool;
 static void *mem_pool_end = &mem_pool[POOL_SIZE];
 #else
-# define PAGE_SIZE (slab_alignment)
+# define PAGE_SIZE slab_alignment
 #endif
 
 #define STARTUP_SIZE    2