From 4af48ea635bc5dd74983df66785c1de631e38024 Mon Sep 17 00:00:00 2001
From: Nicholas Donaldson <nic-donaldson@users.noreply.github.com>
Date: Sun, 28 Jun 2020 11:31:28 -0700
Subject: [PATCH] formatting. create EXTZONES

---
 CMakeLists.txt    |  2 ++
 include/EXTLLVM.h |  8 ++------
 src/EXTLLVM.cpp   | 39 ++++++++++++++++++---------------------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95445a88f..e93881872 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,6 +375,7 @@ if (DYLIB)
   add_library(extempore SHARED src/Extempore.cpp
     src/AudioDevice.cpp
     src/EXTLLVM.cpp
+    src/EXTZONES.cpp
     src/EXTLLVM2.cpp
     src/EXTThread.cpp
     src/Extempore.cpp
@@ -393,6 +394,7 @@ else()
   add_executable(extempore src/Extempore.cpp
     src/AudioDevice.cpp
     src/EXTLLVM.cpp
+    src/EXTZONES.cpp
     src/EXTLLVM2.cpp
     src/LLVMIRCompilation.cpp
     src/EXTThread.cpp
diff --git a/include/EXTLLVM.h b/include/EXTLLVM.h
index 614c1522d..2a3c064ff 100644
--- a/include/EXTLLVM.h
+++ b/include/EXTLLVM.h
@@ -32,9 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  */
-
-#ifndef _EXTLLVM_H
-#define _EXTLLVM_H
+#pragma once
 
 #include "Scheme.h"
 #include "BranchPrediction.h"
@@ -61,7 +59,7 @@ struct llvm_zone_t {
 };
 
 struct _llvm_callback_struct_ {
-    void(*fptr)(void*,llvm_zone_t*);
+    void (*fptr)(void*, llvm_zone_t*);
     void* dat;
     llvm_zone_t* zone;
 };
@@ -206,5 +204,3 @@ EXPORT const char* llvm_disassemble(const unsigned char*  Code, int Syntax);
 }
 
 }
-
-#endif
diff --git a/src/EXTLLVM.cpp b/src/EXTLLVM.cpp
index cc17be5c8..14fe80920 100644
--- a/src/EXTLLVM.cpp
+++ b/src/EXTLLVM.cpp
@@ -143,16 +143,16 @@ THREAD_LOCAL uint64_t tls_llvm_zone_stacksize = 0;
 
 EXPORT void llvm_zone_print(llvm_zone_t* zone)
 {
-  auto tmp(zone);
-  auto total_size(zone->size);
-  int64_t segments(1);
-  while (tmp->memories) {
-    tmp = tmp->memories;
-    total_size += tmp->size;
-    segments++;
-  }
-  printf("<MemZone(%p) size(%" PRId64 ") free(%" PRId64 ") segs(%" PRId64 ")>",zone,total_size,(zone->size - zone->offset),segments);
-  return;
+    auto tmp(zone);
+    auto total_size(zone->size);
+    int64_t segments(1);
+    while (tmp->memories) {
+        tmp = tmp->memories;
+        total_size += tmp->size;
+        segments++;
+    }
+    printf("<MemZone(%p) size(%" PRId64 ") free(%" PRId64 ") segs(%" PRId64 ")>", zone, total_size, (zone->size - zone->offset), segments);
+    return;
 }
 
 EXPORT uint64_t llvm_zone_ptr_size(void* ptr) // could be inline version in llvm (as well)
@@ -166,14 +166,14 @@ EXPORT bool llvm_zone_copy_ptr(void* ptr1, void* ptr2)
     uint64_t size2 = llvm_zone_ptr_size(ptr2);
 
     if (unlikely(size1 != size2)) {
-  //printf("Bad LLVM ptr copy - size mismatch setting %p:%lld -> %p:%lld\n",ptr1,size1,ptr2,size2);
-      return 1;
+        // printf("Bad LLVM ptr copy - size mismatch setting %p:%lld -> %p:%lld\n", ptr1, size1, ptr2, size2);
+        return 1;
     }
     if (unlikely(!size1)) {
-  //printf("Bad LLVM ptr copy - size mismatch setting %p:%lld -> %p:%lld\n",ptr1,size1,ptr2,size2);
-      return 1;
+        // printf("Bad LLVM ptr copy - size mismatch setting %p:%lld -> %p:%lld\n", ptr1, size1, ptr2, size2);
+        return 1;
     }
-    //printf("zone_copy_ptr: %p,%p,%lld,%lld\n",ptr2,ptr1,size1,size2);
+    // printf("zone_copy_ptr: %p,%p,%lld,%lld\n", ptr2, ptr1, size1, size2);
     std::memcpy(ptr2, ptr1, size1);
     return 0;
 }
@@ -188,8 +188,9 @@ EXPORT bool llvm_ptr_in_zone(llvm_zone_t* zone, void* ptr)
 
 EXPORT void llvm_schedule_callback(long long time, void* dat)
 {
-  //printf("scheduled callback %lld\n",time);
-  extemp::SchemeProcess* proc = extemp::SchemeProcess::I(); //extemp::SchemeProcess::I()->extemporeCallback(time,dat);
+  // printf("scheduled callback %lld\n",time);
+  // extemp::SchemeProcess::I()->extemporeCallback(time,dat);
+  extemp::SchemeProcess* proc = extemp::SchemeProcess::I();
 
   uint64_t current_time = time; //task->getStartTime();
   uint64_t duration = 1000000000; //task->getDuration();
@@ -280,9 +281,6 @@ EXPORT void llvm_send_udp(char* host, int port, void* message, int message_lengt
   return;
 }
 
-
-
-
 /////////////////////////////////////////////////
 // This added for dodgy continuations support
 // ucontext_t* llvm_make_ucontext()
@@ -631,7 +629,6 @@ pointer llvm_scheme_env_set(scheme* _sc, char* sym)
 
 
 namespace extemp {
-
 namespace EXTLLVM {
 
 // TODO: seems like we could remove the indirection