From 232607278a81cf8dd00ef4063299d8635d5378f7 Mon Sep 17 00:00:00 2001
From: Geoff Langdale <geoff.langdale@gmail.com>
Date: Tue, 1 May 2018 10:39:26 +1000
Subject: [PATCH] Tapes now self-describing. Introduced temporary limit of 16MB
 (2^24) file size (fix later w. streaming)

---
 main.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/main.cpp b/main.cpp
index 51ec631b..58a38e4f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -53,7 +53,8 @@ ifstream is(filename, ios::binary);
         size_t length = buffer.str().size();
         char * aligned_buffer;
         if (posix_memalign( (void **)&aligned_buffer, 64, ROUNDUP_N(length, 64))) {
-            throw "Allocation failed";
+            cerr << "Could not allocate memory\n";
+            exit(1);
         };
         memset(aligned_buffer, 0x20, ROUNDUP_N(length, 64));
         memcpy(aligned_buffer, buffer.str().c_str(), length);
@@ -478,7 +479,8 @@ never_inline bool ape_machine(const u8 * buf, UNUSED size_t len, ParsedJson & pj
         cout << "TAPE MACHINE: depth change " << (s32)depth_adjust 
              << " write_size " << (u32)write_size << " current_depth: " << depth << "\n";  
 #endif
-        tape[tape_locs[depth]] = take_uptape ? old_tape_loc : idx;
+        u32 write_val = take_uptape ? old_tape_loc : idx;
+        tape[tape_locs[depth]] = write_val | (c << 24); // hack. Assumes no more than 2^24 tape items and buffer size for now
         old_tape_loc = tape_locs[depth] += write_size;
 
         // STATE MACHINE
@@ -504,7 +506,10 @@ never_inline bool ape_machine(const u8 * buf, UNUSED size_t len, ParsedJson & pj
         cout << " state: " << states[i] << "\n"; 
 #ifdef DUMP_TAPES
         for (u32 j = start_loc; j < tape_locs[i]; j++) {
-            cout << "j: " << j << " tape[j]: " << tape[j] << "\n";
+            if (tape[j]) {
+                cout << "j: " << j << " tape[j] char " << (char)(tape[j]>>24) 
+                     << " tape[j][0..23]: " << (tape[j]&0xffffff) << "\n";
+            }
         }
 #endif
     }
@@ -573,9 +578,14 @@ int main(int argc, char * argv[]) {
     ParsedJson pj;
 
     if (posix_memalign( (void **)&pj.structurals, 8, ROUNDUP_N(p.second, 64)/8)) {
-        throw "Allocation failed";
+        cerr << "Could not allocate memory\n";
+        exit(1);
     };
 
+    if (p.second > 0xffffff) {
+        cerr << "Currently only support JSON files < 16MB\n";
+        exit(1);
+    }
     init_state_machine();
 
     pj.n_structural_indexes = 0;