chore: Reorganize the runtime layout (#439)

Reorganize the top-level of the c-dependencies/js-compute-runtime directory a bit, to prepare for splitting up js-compute-builtins.cpp further.

Author: elliottt

c-dependencies/js-compute-runtime/Makefile

@@ -34,7 +34,7 @@ WIT_BINDGEN ?= $(shell which wit-bindgen)
 OPT_FLAGS ?= -O2
 
 # Command helpers for making nice build output.
-include commands.mk
+include mk/commands.mk
 
 # Derived configuration ########################################################
 
@@ -148,6 +148,12 @@ $(OBJ_DIR)/builtins:
 $(OBJ_DIR)/builtins/shared:
 	$(call cmd,mkdir,$@)
 
+$(OBJ_DIR)/core:
+	$(call cmd,mkdir,$@)
+
+$(OBJ_DIR)/host_interface:
+	$(call cmd,mkdir,$@)
+
 # Downloaded dependencies ######################################################
 
 $(BUILD)/openssl-$(OPENSSL_VERSION).tar.gz: URL=https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
@@ -165,9 +171,9 @@ wasi_snapshot_preview1.wasm:
 openssl: $(BUILD)/openssl/token
 
 # Extract and prepare the openssl build directory.
-$(BUILD)/openssl-$(OPENSSL_VERSION)/token: $(BUILD)/openssl-$(OPENSSL_VERSION).tar.gz $(FSM_SRC)/getuid.patch
+$(BUILD)/openssl-$(OPENSSL_VERSION)/token: $(BUILD)/openssl-$(OPENSSL_VERSION).tar.gz $(FSM_SRC)/third_party/getuid.patch
 	$Q tar -C $(BUILD) -xf $<
-	$Q patch -d $(BUILD)/openssl-$(OPENSSL_VERSION) -p1 < $(FSM_SRC)/getuid.patch
+	$Q patch -d $(BUILD)/openssl-$(OPENSSL_VERSION) -p1 < $(FSM_SRC)/third_party/getuid.patch
 	$Q touch $@
 
 OPENSSL_OPTS := -static -no-sock -no-asm -no-ui-console -no-egd
@@ -244,6 +250,8 @@ endif
 FSM_CPP := $(wildcard $(FSM_SRC)/*.cpp)
 FSM_CPP += $(wildcard $(FSM_SRC)/builtins/*.cpp)
 FSM_CPP += $(wildcard $(FSM_SRC)/builtins/shared/*.cpp)
+FSM_CPP += $(wildcard $(FSM_SRC)/core/*.cpp)
+FSM_CPP += $(wildcard $(FSM_SRC)/host_interface/*.cpp)
 FSM_OBJ := $(patsubst $(FSM_SRC)/%.cpp,$(OBJ_DIR)/%.o,$(FSM_CPP))
 
 # Build all the above object files

c-dependencies/js-compute-runtime/builtins/backend.cpp

@@ -19,7 +19,7 @@
 
 #include "builtins/backend.h"
 #include "builtins/request-response.h"
-#include "host_call.h"
+#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 #include "js/Conversions.h"
 

c-dependencies/js-compute-runtime/builtins/cache-override.cpp

@@ -8,7 +8,7 @@
 #include "js/Conversions.h"
 
 #include "cache-override.h"
-#include "host_call.h"
+#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 
 namespace builtins {

c-dependencies/js-compute-runtime/builtins/client-info.cpp

@@ -1,5 +1,5 @@
 #include "builtins/client-info.h"
-#include "geo_ip.h"
+#include "core/geo_ip.h"
 #include "xqd-world/xqd_world_adapter.h"
 
 #include "js/JSON.h"

c-dependencies/js-compute-runtime/builtins/compression-stream.cpp

@@ -11,7 +11,7 @@
 #include "builtins/compression-stream.h"
 #include "builtins/transform-stream-default-controller.h"
 #include "builtins/transform-stream.h"
-#include "host_call.h"
+#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 
 namespace builtins {

c-dependencies/js-compute-runtime/builtins/config-store.cpp

@@ -1,5 +1,5 @@
 #include "config-store.h"
-#include "host_call.h"
+#include "host_interface/host_call.h"
 
 namespace builtins {
 

c-dependencies/js-compute-runtime/builtins/crypto.cpp

@@ -6,8 +6,8 @@
 #pragma clang diagnostic pop
 
 #include "crypto.h"
+#include "host_interface/xqd.h"
 #include "subtle-crypto.h"
-#include "xqd.h"
 
 bool is_int_typed_array(JSObject *obj) {
   return JS_IsInt8Array(obj) || JS_IsUint8Array(obj) || JS_IsInt16Array(obj) ||

c-dependencies/js-compute-runtime/builtins/decompression-stream.cpp

@@ -11,7 +11,7 @@
 #include "builtins/decompression-stream.h"
 #include "builtins/transform-stream-default-controller.h"
 #include "builtins/transform-stream.h"
-#include "host_call.h"
+#include "host_interface/host_call.h"
 #include "js-compute-builtins.h"
 
 namespace builtins {

c-dependencies/js-compute-runtime/builtins/dictionary.cpp

@@ -1,5 +1,5 @@
 #include "dictionary.h"
-#include "host_call.h"
+#include "host_interface/host_call.h"
 
 namespace builtins {
 

c-dependencies/js-compute-runtime/builtins/fastly.cpp

@@ -13,8 +13,8 @@
 #include "builtins/fastly.h"
 #include "builtins/logger.h"
 #include "builtins/url.h"
-#include "geo_ip.h"
-#include "host_call.h"
+#include "core/geo_ip.h"
+#include "host_interface/host_call.h"
 
 namespace builtins {