From a7f25d88191a9ca8d335761f7905231a723e19f0 Mon Sep 17 00:00:00 2001
From: Brad Nelson <flagxor@gmail.com>
Date: Sun, 10 Jul 2022 11:44:38 -0700
Subject: [PATCH] Relocate common tooling.

---
 Makefile                              | 8 ++++----
 {common => tools}/source_to_string.js | 0
 web/web.template.js                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename {common => tools}/source_to_string.js (100%)

diff --git a/Makefile b/Makefile
index 4d0b89f..817e327 100644
--- a/Makefile
+++ b/Makefile
@@ -199,7 +199,7 @@ POSIX_BOOT =  $(COMMON_PHASE1) \
               posix/sockets.fs posix/telnetd.fs posix/httpd.fs posix/web_interface.fs \
               posix/autoboot.fs \
               common/fini.fs
-$(GEN)/posix_boot.h: common/source_to_string.js $(POSIX_BOOT) | $(GEN)
+$(GEN)/posix_boot.h: tools/source_to_string.js $(POSIX_BOOT) | $(GEN)
 	$< boot $(VERSION) $(REVISION) $(POSIX_BOOT) >$@
 
 WINDOWS_BOOT = $(COMMON_PHASE1) \
@@ -214,7 +214,7 @@ WINDOWS_BOOT = $(COMMON_PHASE1) \
                windows/graphics.fs \
                posix/autoboot.fs \
                common/fini.fs
-$(GEN)/windows_boot.h: common/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
+$(GEN)/windows_boot.h: tools/source_to_string.js $(WINDOWS_BOOT) | $(GEN)
 	$< -win boot $(VERSION) $(REVISION) $(WINDOWS_BOOT) >$@
 
 ESP32_BOOT = $(COMMON_PHASE1) \
@@ -226,7 +226,7 @@ ESP32_BOOT = $(COMMON_PHASE1) \
              esp32/bterm.fs posix/telnetd.fs \
              esp32/camera.fs esp32/camera_server.fs \
              esp32/autoboot.fs common/fini.fs
-$(GEN)/esp32_boot.h: common/source_to_string.js $(ESP32_BOOT) | $(GEN)
+$(GEN)/esp32_boot.h: tools/source_to_string.js $(ESP32_BOOT) | $(GEN)
 	$< boot $(VERSION) $(REVISION) $(ESP32_BOOT) >$@
 
 $(GEN)/dump_web_opcodes: web/dump_web_opcodes.c common/opcodes.h | $(GEN)
@@ -243,7 +243,7 @@ WEB_BOOT =  $(COMMON_PHASE1) \
             $(COMMON_PHASE2) \
             posix/autoboot.fs \
             common/fini.fs
-$(GEN)/web_boot.js: common/source_to_string.js $(WEB_BOOT) | $(GEN)
+$(GEN)/web_boot.js: tools/source_to_string.js $(WEB_BOOT) | $(GEN)
 	$< -web boot $(VERSION) $(REVISION) $(WEB_BOOT) >$@
 
 # ---- RESOURCES ----
diff --git a/common/source_to_string.js b/tools/source_to_string.js
similarity index 100%
rename from common/source_to_string.js
rename to tools/source_to_string.js
diff --git a/web/web.template.js b/web/web.template.js
index a066a2b..50e0ba5 100644
--- a/web/web.template.js
+++ b/web/web.template.js
@@ -107,7 +107,7 @@ function create(name, opcode) {
   i32[i32[g_heap>>2]>>2] = name.length;  // length
   i32[g_heap>>2] += 4;
 
-  i32[i32[g_heap>>2]>>2] = i32[i32[g_current]>>2]>>2];  // link
+  i32[i32[g_heap>>2]>>2] = i32[i32[i32[g_current]>>2]>>2];  // link
   i32[g_heap>>2] += 4;
 
   i32[i32[g_heap>>2]>>2] = 0;  // flags