From 934260fc2753b6e52aa2103dc2cae3fb8a722f8c Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 1 Apr 2017 23:30:45 +0200
Subject: [PATCH] mini-mes: Workarounds for gc.c.

* gc.c (gc_copy)[!__GNUC__]: Avoid by value assignment from array-of
  struct entry.
* scaffold/mini-mes.c (gc_init_cells): Workarounds.
---
 gc.c                | 29 +++++++++++++++++++++
 scaffold/mini-mes.c | 62 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/gc.c b/gc.c
index 2f197eda..54c2351a 100644
--- a/gc.c
+++ b/gc.c
@@ -70,12 +70,41 @@ gc_copy (SCM old) ///((internal))
 {
   if (TYPE (old) == TBROKEN_HEART) return g_cells[old].car;
   SCM new = g_free++;
+#if 0
   g_news[new] = g_cells[old];
+#else
+  SCM y = new;
+  SCM z = old;
+  SCM zz = TYPE (z);
+  NTYPE (y) = zz;
+  zz = CAR (z);
+  NCAR (y) = zz;
+  zz = CDR (z);
+  NCDR (y) = zz;
+#endif
   if (NTYPE (new) == TVECTOR)
     {
       NVECTOR (new) = g_free;
       for (int i=0; i<LENGTH (old); i++)
+#if 0
+        //__GNUC__
         g_news[g_free++] = g_cells[VECTOR (old)+i];
+#else
+      {
+        //eputs ("gc_copy\n");
+        y = g_free;
+        g_free++;
+        z = VECTOR (old);
+        z = z + i;
+        //z = g_cells[z];
+        zz = TYPE (z);
+        NTYPE (y) = zz;
+        zz = CAR (z);
+        NCAR (y) = zz;
+        zz = CDR (z);
+        NCDR (y) = zz;
+      }
+#endif
     }
   TYPE (old) = TBROKEN_HEART;
   CAR (old) = new;
diff --git a/scaffold/mini-mes.c b/scaffold/mini-mes.c
index 33bf34f8..634659cf 100644
--- a/scaffold/mini-mes.c
+++ b/scaffold/mini-mes.c
@@ -1439,27 +1439,65 @@ gc_init_cells () ///((internal))
 {
   //return 0;
   //g_cells = (scm *)malloc (ARENA_SIZE);
+  //int size = ARENA_SIZE * sizeof (struct scm);
+  int size = ARENA_SIZE * 12;
+#if MES_GC
+  size = size * 2;
+#endif
 #if __GNUC__
-  arena = (char*)malloc (ARENA_SIZE);
+  arena = (char*)malloc (size);
 #else
   char *p = 0;
-  p = malloc (ARENA_SIZE);
+  p = malloc (size);
   arena = p;
 #endif
   g_cells = arena;
   return 0;
   //g_cells = (scm *)malloc (2*ARENA_SIZE*sizeof(scm));
 
-// #if __NYACC__ || FIXME_NYACC
-//   TYPE (0) = TVECTOR;
-// // #else
-// //   TYPE (0) = VECTOR;
-// #endif
-//   LENGTH (0) = 1000;
-//   VECTOR (0) = 0;
-//   g_cells++;
-//   TYPE (0) = CHAR;
-//   VALUE (0) = 'c';
+  TYPE (0) = TVECTOR;
+  LENGTH (0) = 1000;
+  VECTOR (0) = 0;
+  g_cells++;
+  TYPE (0) = TCHAR;
+  VALUE (0) = 'c';
+  return 0;
+}
+
+SCM
+gc_init_news () ///((internal))
+{
+  eputs ("gc_init_news\n");
+  ///g_news = g_cells-1 + ARENA_SIZE;
+  //g_news = g_cells + ARENA_SIZE * 12 + GC_SAFETY * 6;
+  char *p = g_cells;
+  // g_news = g_cells;
+  int halfway = ARENA_SIZE * 12;
+  int safety = GC_SAFETY * 12;
+  safety = safety / 2;
+  halfway = halfway + safety;
+  // g_news = g_news + halfway;
+  p = p + halfway;
+  g_news = p;
+  eputs ("g_cells=");
+  eputs (itoa (g_cells));
+  eputs (" size=");
+  eputs (itoa (halfway));
+  eputs (" news=");
+  eputs (itoa (g_news));
+  eputs (" news - cells=");
+  char * c = g_cells;
+  eputs (itoa (p - c));
+  eputs ("\n");
+
+
+  NTYPE (0) = TVECTOR;
+  NLENGTH (0) = 1000;
+  NVECTOR (0) = 0;
+  g_news++;
+  NTYPE (0) = TCHAR;
+  NVALUE (0) = 'n';
+  return 0;
 }
 
 // INIT NEWS