libcheri_caprevoke: style(9) pass

lib/libcheri_caprevoke/libcaprevoke.h

@@ -67,10 +67,10 @@ void caprev_shadow_nomap_clear_raw(ptraddr_t sbase, uint64_t * __capability sb,
  ptraddr_t heap_start, ptraddr_t heap_end);
 
 /* Utility functions for testing */
-void caprev_shadow_nomap_offsets(
- ptraddr_t ob, size_t len, ptrdiff_t *fwo, ptrdiff_t *lwo);
+void caprev_shadow_nomap_offsets(ptraddr_t ob, size_t len, ptrdiff_t *fwo,
+ ptrdiff_t *lwo);
 
-void caprev_shadow_nomap_masks(
- ptraddr_t ob, size_t len, uint64_t *fwm, uint64_t *lwm);
+void caprev_shadow_nomap_masks(ptraddr_t ob, size_t len, uint64_t *fwm,
+ uint64_t *lwm);
 
 #endif

lib/libcheri_caprevoke/libcheri_caprevoke.c

@@ -65,19 +65,19 @@ static uint64_t caprev_shadow_nomap_last_word_mask(ptraddr_t base, size_t len);
 static ptrdiff_t
 caprev_shadow_nomap_first_word_offset(ptraddr_t base)
 {
- return (ptrdiff_t)(
+ return ((ptrdiff_t)(
  base / VM_CHERI_REVOKE_GSZ_MEM_NOMAP / 8 / sizeof(uint64_t)) *
- sizeof(uint64_t);
+ sizeof(uint64_t));
 }
 
 static ptrdiff_t
 caprev_shadow_nomap_last_word_offset(ptraddr_t base, size_t len)
 {
  if (len == 0)
- return caprev_shadow_nomap_first_word_offset(base);
+ return (caprev_shadow_nomap_first_word_offset(base));
 
- return (ptrdiff_t)((base + len - 1) / VM_CHERI_REVOKE_GSZ_MEM_NOMAP / 8
- / sizeof(uint64_t)) * sizeof(uint64_t);
+ return ((ptrdiff_t)((base + len - 1) / VM_CHERI_REVOKE_GSZ_MEM_NOMAP / 8
+ / sizeof(uint64_t)) * sizeof(uint64_t));
 }
 
 /*
@@ -102,17 +102,17 @@ caprev_shadow_nomap_first_word_mask(ptraddr_t base, size_t len)
  int setwidth = len / VM_CHERI_REVOKE_GSZ_MEM_NOMAP;
 
  if (lsb + setwidth == 64) {
- /* Object fills this word completely, but does not spill
- * to the next */
-
+ /*
+ * Object fills this word completely, but does not spill
+ * to the next
+ */
  res = ~(((uint64_t)1 << lsb) - 1);
  } else {
  res = (~(((uint64_t)1 << (lsb + setwidth)) - 1) ^
  (~(((uint64_t)1 << lsb) - 1)));
  }
  } else {
  /* The object runs off the end of this word. */
-
  res = ~(((uint64_t)1 << lsb) - 1);
  }
 
@@ -127,22 +127,19 @@ caprev_shadow_nomap_last_word_mask(ptraddr_t base, size_t len)
 
  if (caprev_shadow_nomap_first_word_offset(base) ==
  caprev_shadow_nomap_last_word_offset(base, len)) {
-
  /*
  * There are no more bits to set that haven't been taken care of
  * by the the first word, so just return 0.
  */
-
- return 0;
+ return (0);
  }
 
  msb = ((base + len - 1) / VM_CHERI_REVOKE_GSZ_MEM_NOMAP) %
  (8 * sizeof(uint64_t));
 
  if (msb == 63) {
  /* This object runs to the end of its last word */
-
- return ~(uint64_t)0;
+ return (~(uint64_t)0);
  }
 
  res = ((uint64_t)1 << (msb + 1)) - 1;
@@ -158,8 +155,8 @@ caprev_shadow_nomap_last_word_mask(ptraddr_t base, size_t len)
  * functions available, maybe?
  */
 void
-caprev_shadow_nomap_offsets(
- ptraddr_t ob, size_t len, ptrdiff_t *fwo, ptrdiff_t *lwo)
+caprev_shadow_nomap_offsets(ptraddr_t ob, size_t len, ptrdiff_t *fwo,
+ ptrdiff_t *lwo)
 {
  *fwo = caprev_shadow_nomap_first_word_offset(ob);
  *lwo = caprev_shadow_nomap_last_word_offset(ob, len);
@@ -241,7 +238,7 @@ caprev_shadow_nomap_set_len(ptraddr_t sbase, uint64_t * __capability sb,
  * a veneer of abstraction, because it's a little much to expect of C.
  */
  if (!caprev_shadow_set_fw(fw, user_obj, fwm)) {
- return 1;
+ return (1);
  }
 
  if (lwo != fwo) {
@@ -294,7 +291,7 @@ caprev_shadow_nomap_set_len(ptraddr_t sbase, uint64_t * __capability sb,
  * stores visible.
  */
 
- return 0;
+ return (0);
 }
 
 /*
@@ -322,8 +319,9 @@ int
 caprev_shadow_nomap_set(ptraddr_t sbase, uint64_t * __capability sb,
  void * __capability priv_obj, void * __capability user_obj)
 {
- return caprev_shadow_nomap_set_len(sbase, sb,
- (__cheri_addr ptraddr_t)priv_obj, cheri_getlen(priv_obj), user_obj);
+ return (caprev_shadow_nomap_set_len(sbase, sb,
+ (__cheri_addr ptraddr_t)priv_obj, cheri_getlen(priv_obj),
+ user_obj));
 }
 
 /*
@@ -397,8 +395,8 @@ void
 caprev_shadow_nomap_clear(ptraddr_t sbase, uint64_t * __capability sb,
  void * __capability obj)
 {
- return caprev_shadow_nomap_clear_len(sbase, sb,
- (__cheri_addr ptraddr_t)obj, cheri_getlen(obj));
+ return (caprev_shadow_nomap_clear_len(sbase, sb,
+ (__cheri_addr ptraddr_t)obj, cheri_getlen(obj)));
 }
 
 /*