VM: Refactor utilities.cpp/hpp to Factor style

diff --git a/vm/utilities.cpp b/vm/utilities.cpp
index 91bf48abc6c68fd537e68597fe65066c788810fa..e8aefea3925be984efb57d80a6b40bcacf1e9ad3 100644 (file)
--- a/vm/utilities.cpp
+++ b/vm/utilities.cpp
@@ -1,45 +1,41 @@
 #include "master.hpp"
 
-namespace factor
-{
+namespace factor {
 
 /* Fill in a PPC function descriptor */
-void *fill_function_descriptor(void *ptr, void *code)
-{
-       void **descriptor = (void **)ptr;
-       descriptor[0] = code;
-       descriptor[1] = NULL;
-       descriptor[2] = NULL;
-       return descriptor;
+void* fill_function_descriptor(void* ptr, void* code) {
+  void** descriptor = (void**)ptr;
+  descriptor[0] = code;
+  descriptor[1] = NULL;
+  descriptor[2] = NULL;
+  return descriptor;
 }
 
 /* Get a field from a PPC function descriptor */
-void *function_descriptor_field(void *ptr, size_t idx)
-{
-       return ptr ? ((void **) ptr)[idx] : ptr;
+void* function_descriptor_field(void* ptr, size_t idx) {
+  return ptr ? ((void**)ptr)[idx] : ptr;
 }
 
 /* If memory allocation fails, bail out */
-vm_char *safe_strdup(const vm_char *str)
-{
-       vm_char *ptr = STRDUP(str);
-       if(!ptr) fatal_error("Out of memory in safe_strdup", 0);
-       return ptr;
+vm_char* safe_strdup(const vm_char* str) {
+  vm_char* ptr = STRDUP(str);
+  if (!ptr)
+    fatal_error("Out of memory in safe_strdup", 0);
+  return ptr;
 }
 
-cell read_cell_hex()
-{
-       cell cell;
-       std::cin >> std::hex >> cell >> std::dec;
-       if(!std::cin.good()) exit(1);
-       return cell;
+cell read_cell_hex() {
+  cell cell;
+  std::cin >> std::hex >> cell >> std::dec;
+  if (!std::cin.good())
+    exit(1);
+  return cell;
 }
 
 /* On Windows, memcpy() is in a different DLL and the non-optimizing
 compiler can't find it */
-VM_C_API void *factor_memcpy(void *dst, void *src, size_t len)
-{
-       return memcpy(dst,src,len);
+VM_C_API void* factor_memcpy(void* dst, void* src, size_t len) {
+  return memcpy(dst, src, len);
 }
 
 }

diff --git a/vm/utilities.hpp b/vm/utilities.hpp
index 5f37644213e42b5465c185888e7257c04902954f..cd84fb4526e1445afea7be1bd2773b621bad9ce0 100644 (file)
--- a/vm/utilities.hpp
+++ b/vm/utilities.hpp
@@ -1,56 +1,49 @@
-namespace factor
-{
+namespace factor {
 
-inline static void memset_2(void *dst, u16 pattern, size_t size)
-{
+inline static void memset_2(void* dst, u16 pattern, size_t size) {
 #ifdef __APPLE__
-       cell cell_pattern = (pattern | (pattern << 16));
-       memset_pattern4(dst,&cell_pattern,size);
+  cell cell_pattern = (pattern | (pattern << 16));
+  memset_pattern4(dst, &cell_pattern, size);
 #else
-       if(pattern == 0)
-               memset(dst,0,size);
-       else
-       {
-               u16 *start = (u16 *)dst;
-               u16 *end = (u16 *)((cell)dst + size);
-               while(start < end)
-               {
-                       *start = pattern;
-                       start++;
-               }
-       }
+  if (pattern == 0)
+    memset(dst, 0, size);
+  else {
+    u16* start = (u16*)dst;
+    u16* end = (u16*)((cell) dst + size);
+    while (start < end) {
+      *start = pattern;
+      start++;
+    }
+  }
 #endif
 }
 
-inline static void memset_cell(void *dst, cell pattern, size_t size)
-{
+inline static void memset_cell(void* dst, cell pattern, size_t size) {
 #ifdef __APPLE__
-       #ifdef FACTOR_64
-               memset_pattern8(dst,&pattern,size);
-       #else
-               memset_pattern4(dst,&pattern,size);
-       #endif
+#ifdef FACTOR_64
+  memset_pattern8(dst, &pattern, size);
 #else
-       if(pattern == 0)
-               memset(dst,0,size);
-       else
-       {
-               cell *start = (cell *)dst;
-               cell *end = (cell *)((cell)dst + size);
-               while(start < end)
-               {
-                       *start = pattern;
-                       start++;
-               }
-       }
+  memset_pattern4(dst, &pattern, size);
+#endif
+#else
+  if (pattern == 0)
+    memset(dst, 0, size);
+  else {
+    cell* start = (cell*)dst;
+    cell* end = (cell*)((cell) dst + size);
+    while (start < end) {
+      *start = pattern;
+      start++;
+    }
+  }
 #endif
 }
 
-void *fill_function_descriptor(void *ptr, void *code);
-void *function_descriptor_field(void *ptr, size_t idx);
+void* fill_function_descriptor(void* ptr, void* code);
+void* function_descriptor_field(void* ptr, size_t idx);
 
-vm_char *safe_strdup(const vm_char *str);
+vm_char* safe_strdup(const vm_char* str);
 cell read_cell_hex();
-VM_C_API void *factor_memcpy(void *dst, void *src, size_t len);
+VM_C_API void* factor_memcpy(void* dst, void* src, size_t len);
 
 }