[DO NOT MERGE] Compile using Xahau Repo

.gitmodules

@@ -9,4 +9,4 @@
 	url = https://github.com/XRPLF/hook-cleaner-c
 [submodule "c2wasm-api/clang/includes"]
 	path = c2wasm-api/clang/includes
-	url = https://github.com/XRPLF/hook-macros
+	url = https://github.com/Xahau/xahaud

README.md

@@ -56,7 +56,7 @@ unzip bin.zip
 ```
 
 - CD to docker folder `cd docker`
-- Run `make c2wasm-api && make clangd && make wasi-sdk && make hook-cleaner`
+- Run `make c2wasm-api && make clangd && make wasi-sdk && make hook-cleaner && make c2wasm-api/clang/includes/src/ripple/app/hook`
 - Run `docker-compose build`
 - Run `docker-compose up` or `docker-compose up -d`
 - This should start server at port `:9000`, the actual compiling endpoint is this: [http://localhost:9000/api/build](localhost:9000/api/build). Note that it takes a while to start.

c2wasm-api/copyheaders.sh

@@ -9,12 +9,12 @@ then
 else
     mkdir -p /work/c
 fi
-cp clang/includes/*.h /work/c
+cp clang/includes/hook/*.h /work/c
 
 if [ -d /app/clang/includes ]
 then
     rm /app/clang/includes/*.h
 else
     mkdir -p /app/clang/includes
 fi
-cp clang/includes/*.h /app/clang/includes
+cp clang/include/hook/*.h /app/clang/includes

c2wasm-api/src/index.ts

@@ -100,18 +100,51 @@ function shell_exec(cmd: string, cwd: string) {
   return result;
 }
 
+const optimization_options = [
+  /* default '-O0' not included */ '-O1', '-O2', '-O3', '-O4', '-Oz'
+];
+
 function get_optimization_options(options: string) {
-  const optimization_options = [
-    /* default '-O0' not included */ '-O1', '-O2', '-O3', '-O4', '-Os'
-  ];
 
-  let safe_options = '';
+  let optimization_level = '';
   for (let o of optimization_options) {
     if (options.includes(o)) {
-      safe_options += ' ' + o;
+      optimization_level == o;
     }
   }
 
+  let safe_options = '';
+  const _options = [
+    '--shrink-level=100000000',
+		'--coalesce-locals-learning',
+		'--vacuum',
+		'--merge-blocks',
+		'--merge-locals',
+		'--flatten',
+		'--ignore-implicit-traps',
+		'-ffm',
+		'--const-hoisting',
+		'--code-folding',
+		'--code-pushing',
+		'--dae-optimizing',
+		'--dce',
+		'--simplify-globals-optimizing',
+		'--simplify-locals-nonesting',
+		'--reorder-locals',
+		'--rereloop',
+		'--precompute-propagate',
+		'--local-cse',
+		'--remove-unused-brs',
+		'--memory-packing',
+		'-c',
+		'--avoid-reinterprets',
+		optimization_level
+  ]
+
+  for (let o of _options) {
+    safe_options += ' ' + o;
+  }
+
   return safe_options;
 }
 
@@ -173,7 +206,15 @@ function validate_filename(name: string) {
 function link_c_files(source_files: string[], compile_options: string, link_options: string, cwd: string, output: string, result_obj: Task) {
   const files = source_files.join(' ');
   const clang = llvmDir + '/bin/clang';
-  const cmd = clang + ' ' + get_clang_options(compile_options) + ' ' + get_lld_options(link_options) + ' ' + files + ' -o ' + output;
+  let optimization_level = '';
+  for (let o of optimization_options) {
+    if (compile_options.includes(o)) {
+      optimization_level == o;
+    }
+  }
+  const cmd = clang + ' ' + optimization_level + ' ' + get_clang_options(compile_options) + ' ' + get_lld_options(link_options) + ' ' + files + ' -o ' + output;
+  console.log(cmd);
+
   const out = shell_exec(cmd, cwd);
   result_obj.console = sanitize_shell_output(out);
   if (!existsSync(output)) {
@@ -186,7 +227,7 @@ function link_c_files(source_files: string[], compile_options: string, link_opti
 
 function optimize_wasm(cwd: string, inplace: string, opt_options: string, result_obj: Task) {
   const unopt = cwd + '/unopt.wasm';
-  const cmd = 'wasm-opt ' + opt_options + ' -o ' + inplace + ' ' + unopt;
+  const cmd = 'wasm-opt ' + opt_options + ' -o ' + inplace + ' ' + unopt;  
   const out = openSync(cwd + '/opt.log', 'w');
   let error = '';
   let success = true;
@@ -309,6 +350,27 @@ function build_project(project: RequestBody, base: string) {
       return complete(false, 'Optimization error');
     }
   }
+
+
+  if (strip) {
+    const clean_obj = {
+      name: 'cleaning wasm'
+    };
+    build_result.tasks.push(clean_obj);
+    if (!clean_wasm(dir, result, clean_obj)) {
+      return complete(false, 'Post-build error');
+    }
+  }
+
+  if (opt_options) {
+    const opt_obj = {
+      name: 'optimizing wasm'
+    };
+    build_result.tasks.push(opt_obj);
+    if (!optimize_wasm(dir, result, opt_options, opt_obj)) {
+      return complete(false, 'Optimization error');
+    }
+  }
 
   if (strip) {
     const clean_obj = {

docker/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Vaclav Barta "[email protected]"
 RUN apk --no-cache add su-exec
 COPY clangd /usr/bin
 WORKDIR /app
-COPY c2wasm-api/clang/includes ./clang/includes
+COPY c2wasm-api/clang/includes/hook ./clang/includes
 COPY c2wasm-api/package.json .
 COPY c2wasm-api/yarn.lock .
 COPY c2wasm-api/tsconfig.json .