From 08ea0da74503223ba2875595e5caf5bd9c807611 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 2 Mar 2017 20:19:53 +0100
Subject: [PATCH] mescc: Fix add, sub, lshift.

* module/language/c99/compiler.mes (expr->accu): Fix add, sub, lshift.
* doc/examples/t.c: Test them.
* doc/examples/cons-mes.c:
* doc/examples/mini-mes.c:
---
 module/language/c99/compiler.mes |  6 +--
 scaffold/cons-mes.c              | 74 ++++++++++++++++----------------
 scaffold/mini-mes.c              |  3 --
 scaffold/t.c                     | 12 ++++++
 4 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/module/language/c99/compiler.mes b/module/language/c99/compiler.mes
index 891c8fcb..cbaaf3a1 100644
--- a/module/language/c99/compiler.mes
+++ b/module/language/c99/compiler.mes
@@ -643,7 +643,7 @@
 
         ((add ,a ,b)
          (let* ((empty (clone info #:text '()))
-                (accu ((expr->base empty) a))
+                (accu ((expr->accu empty) a))
                 (base ((expr->base empty) b)))
            (clone info #:text
                   (append text
@@ -654,7 +654,7 @@
 
         ((sub ,a ,b)
          (let* ((empty (clone info #:text '()))
-                (accu ((expr->base empty) a))
+                (accu ((expr->accu empty) a))
                 (base ((expr->base empty) b)))
            (clone info #:text
                   (append text
@@ -665,7 +665,7 @@
 
         ((lshift ,a (p-expr (fixed ,value)))
          (let* ((empty (clone info #:text '()))
-                (accu ((expr->base empty) a))
+                (accu ((expr->accu empty) a))
                 (value (cstring->number value)))
            (clone info #:text
                   (append text
diff --git a/scaffold/cons-mes.c b/scaffold/cons-mes.c
index aa53eee4..77c89294 100644
--- a/scaffold/cons-mes.c
+++ b/scaffold/cons-mes.c
@@ -592,8 +592,6 @@ assert_defined (SCM x, SCM e)
 }
 #endif
 
-#if 1
-  //FIXME GNUC
 SCM
 push_cc (SCM p1, SCM p2, SCM a, SCM c) ///((internal))
 {
@@ -607,7 +605,6 @@ push_cc (SCM p1, SCM p2, SCM a, SCM c) ///((internal))
   r3 = x;
   return cell_unspecified;
 }
-#endif
 
 #if __GNUC__
 SCM caar (SCM x) {return car (car (x));}
@@ -635,9 +632,7 @@ SCM gc_pop_frame ();
 SCM
 eval_apply ()
 {
-  puts ("e/a: fixme\n");
  eval_apply:
-  puts ("eval_apply\n");
   // if (g_free + GC_SAFETY > ARENA_SIZE)
   //   gc_pop_frame (gc (gc_push_frame ()));
 
@@ -651,45 +646,18 @@ eval_apply ()
   SCM y = cell_nil;
 
  apply:
-  puts ("apply\n");
   switch (TYPE (car (r1)))
     {
     case TFUNCTION: {
       puts ("apply.function\n");
-      y = 0x22;
       //check_formals (car (r1), MAKE_NUMBER (FUNCTION (car (r1)).arity), cdr (r1));
-#if __GNUC__
-      r1 = call (car (r1), cdr (r1)); /// FIXME: move into eval_apply
-#else
-      //FIXME
-      x = car (r1);
-      y = cdr (r1);
-      r1 = call (x, y);
-#endif
-      puts ("after call\n");
-      y = 0x44;
+      r1 = call (car (r1), cdr (r1));
       goto vm_return;
     }
     }
-// #if __GNUC__
-//   //FIXME
-//   push_cc (car (r1), r1, r0, cell_vm_apply2);
-// #endif
-//   goto eval;
-//  apply2:
-//   //check_apply (r1, car (r2));
-//   r1 = cons (r1, cdr (r2));
-//   goto apply;
-
- eval:
- begin:
- begin2:
  vm_return:
-  // FIXME
-  puts ("vm-return00\n");
   x = r1;
   gc_pop_frame ();
-  puts ("vm-return01\n");
   r1 = x;
   goto eval_apply;
 }
@@ -1337,7 +1305,22 @@ simple_bload_env (SCM a) ///((internal))
 
   puts ("read done\n");
 
-  g_free = (p-(char*)g_cells) / sizeof (struct scm);
+  // g_free = (p-(char*)g_cells) / sizeof (struct scm);
+  c = p-(char*)g_cells;
+  exit (c);
+  
+  
+  
+  
+ if (g_free != 15) exit (33);
+  
+  // puts ("Xg_free: ");
+  // puts (itoa (g_free));
+  // puts ("\n");
+
+
+  ///if (g_free != 19) return 33;
+  
   // gc_peek_frame ();
   // g_symbols = r1;
   g_symbols = 1;
@@ -1446,10 +1429,22 @@ main (int argc, char *argv[])
   if (argc > 1 && !strcmp (argv[1], "--dump")) return dump ();
 #endif
 
-#if 0
-  //__GNUC__
+#if 1
+
+#if __GNUC__
+  puts ("g_free=");
+  puts (itoa(g_free));
+  puts ("\n");
+#else
+  g_free = 19;
+
+#endif
+
+  //return cons (r0, cell_nil);
+
   //FIXME
   push_cc (r2, cell_unspecified, r0, cell_unspecified);
+#if __GNUC__
   for (int x=19; x<26 ;x++)
     {
       puts(itoa(x));
@@ -1461,16 +1456,19 @@ main (int argc, char *argv[])
       puts(itoa(g_cells[x].cdr));
       puts("\n");
     }
+#endif
 #else
-
   g_stack = 23;
   g_free = 24;
   r1 = r2; //10: the-program
   r2 = cell_unspecified;
 #endif
 
-#if __GNUC__
+  puts ("g_stack: ");
   display_ (g_stack);
+  puts ("\n");
+
+#if __GNUC__
 
   puts ("g_free=");
   puts (itoa(g_free));
diff --git a/scaffold/mini-mes.c b/scaffold/mini-mes.c
index 9ab46856..ffa78723 100644
--- a/scaffold/mini-mes.c
+++ b/scaffold/mini-mes.c
@@ -592,8 +592,6 @@ assert_defined (SCM x, SCM e)
 }
 #endif
 
-#if 1
-  //FIXME GNUC
 SCM
 push_cc (SCM p1, SCM p2, SCM a, SCM c) ///((internal))
 {
@@ -607,7 +605,6 @@ push_cc (SCM p1, SCM p2, SCM a, SCM c) ///((internal))
   r3 = x;
   return cell_unspecified;
 }
-#endif
 
 #if __GNUC__
 SCM caar (SCM x) {return car (car (x));}
diff --git a/scaffold/t.c b/scaffold/t.c
index 7feb9476..ac6628be 100644
--- a/scaffold/t.c
+++ b/scaffold/t.c
@@ -457,6 +457,18 @@ test (char *p)
   *x++ = c;
   if (*g_chars != 'C') return 1;
 
+  puts ("t: 1 + 2\n");
+  if (1 + 2 != 3) return 1;
+
+  puts ("t: 2 - 1\n");
+  if (2 - 1 != 1) return 1;
+
+  puts ("t: 1 << 3\n");
+  if (1 << 3 != 8) return 1;
+
+  puts ("t: 8 / 4\n");
+  if (8 / 4 != 2) return 1;
+
   puts ("t: inc (0)\n");
   if (inc (0) != 1) return 1;