feat: apply tbfleming#13 patch; adjust install cmd; adjust build.py

Author: kkoomen

README.md

@@ -34,7 +34,7 @@ Ubuntu 16.04:
 ```
 sudo apt update
 sudo apt upgrade
-sudo apt install build-essential cmake ninja-build python nodejs-legacy libncurses-dev unzip libboost1.58-tools-dev
+sudo apt install -y build-essential cmake ninja-build python3 nodejs libncurses-dev unzip libboost-all-dev
 ```
 
 ## Building WASM binaries

build.py

@@ -20,7 +20,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-import argparse, os, subprocess, sys
+import argparse, os, subprocess, sys, re
 from urllib.parse import urlparse
 
 useTag = 'cib-013'      # --clone and --checkout retrieve this tag
@@ -167,7 +167,7 @@ def download(url, basename=None):
     # ('repos/fastcomp', 'tbfleming/cib-emscripten-fastcomp.git', 'kripken/emscripten-fastcomp.git', True, 'incoming', 'incoming'),
     # ('repos/fastcomp/tools/clang', 'tbfleming/cib-emscripten-fastcomp-clang.git', 'kripken/emscripten-fastcomp-clang.git', True, 'incoming', 'incoming'),
     ('repos/emscripten', 'tbfleming/cib-emscripten.git', 'kripken/emscripten.git', True, 'incoming', 'cib'),
-    ('repos/wabt', 'WebAssembly/wabt.git', 'WebAssembly/wabt.git', False, 'master', 'master'),
+    ('repos/wabt', 'WebAssembly/wabt.git', 'WebAssembly/wabt.git', False, 'main', 'main'),
     ('repos/binaryen', 'tbfleming/cib-binaryen.git', 'WebAssembly/binaryen.git', True, 'master', 'cib'),
     ('repos/zip.js', 'gildas-lormeau/zip.js.git', 'gildas-lormeau/zip.js.git', False, '3e7920810f63d5057ef6028833243105521da369', '3e7920810f63d5057ef6028833243105521da369'),
     ('repos/eos', 'tbfleming/cib-eos.git', 'EOSIO/eos.git', True, 'dawn-v3.0.0', 'cib'),
@@ -185,6 +185,9 @@ def format():
     run('chmod a-x *.md .gitignore src/*.h src/*.cpp src/*.js src/*.html src/*.txt src/rtl/*')
     run('chmod a-x src/eos/.gitignore src/eos/package.json src/eos/src/*')
 
+def is_commit_hash(commit_hash):
+    return re.match(r'^[0-9a-f]{40}$', commit_hash)
+
 def clone():
     for (path, url, upstream, isPushable, upstreamBranch, branch) in repos:
         if os.path.isdir(path):
@@ -194,9 +197,12 @@ def clone():
         dir = os.path.dirname(path)
         base = os.path.basename(path)
         run('mkdir -p ' + dir)
-        run('cd ' + dir + ' && git clone ' + gitProtocol + url + ' ' + base)
+        if is_commit_hash(branch):
+            run('cd ' + dir + ' && git clone ' + gitProtocol + url + ' ' + base)
+            run('cd ' + path + ' git checkout ' + branch)
+        else:
+            run('cd ' + dir + ' && git clone --branch ' + branch + ' --depth 1 ' + gitProtocol + url + ' ' + base)
         run('cd ' + path + ' && git remote add upstream ' + gitProtocol + upstream)
-        run('cd ' + path + ' && git checkout ' + branch)
 
 def status():
     for (path, url, upstream, isPushable, upstreamBranch, branch) in repos:

src/clang.html

@@ -84,6 +84,13 @@
             flex-direction: column;
             padding: 10px;
         }
+        
+        #pane-input>div {
+            overflow: auto;
+            display: flex;
+            flex-direction: column;
+            padding: 10px;
+        }
 
         #runtime-iframe-container {
             z-index: 41;
@@ -110,6 +117,12 @@
             </div>
             <pre id="clang-io" class="io"></pre>
         </div>
+        <div id="pane-input" class="flex-col">
+            <div>Program Input:</div>
+            <div>
+                <textarea id="inputText" wrap="off"></textarea>
+            </div>
+        </div>
         <div id="pane-gist-links" class="flex-col">
             <div>
                 <h3>Emscripten API</h3>
@@ -212,6 +225,12 @@ <h3>HTML Integration</h3>
                             isClosable: false,
                             componentName: 'component',
                             componentState: { id: 'pane-html-source', className: 'source' }
+                        }, {
+                            type: 'component',
+                            title: 'input',
+                            isClosable: false,
+                            componentName: 'component',
+                            componentState: { id: 'pane-input' }
                         }]
                     }, {
                         type: 'component',
@@ -416,6 +435,7 @@ <h3>HTML Integration</h3>
             runtime.process.postMessage({
                 function: 'run',
                 wasmBinary: clangOutput,
+                userInput: document.getElementById("inputText").value,
             });
         };
 
@@ -470,6 +490,7 @@ <h3>HTML Integration</h3>
                 runtime.process.worker.postMessage({
                     function: 'run',
                     wasmBinary: clangOutput,
+                    userInput: document.getElementById("inputText").value,
                 });
             }
         }
@@ -571,4 +592,4 @@ <h3>HTML Integration</h3>
     </script>
 </body>
 
-</html>
+</html>

src/process-runtime.js

@@ -24,6 +24,9 @@ var inWorker = this.importScripts != undefined;
 var wasmImports = {};
 var wasmExports = {};
 
+var inputText = "";
+var i = 0;
+
 if (inWorker) {
     importScripts('process.js');
     importScripts('wasm-tools.js');
@@ -67,6 +70,14 @@ commands.start = async function ({ moduleName, wasmBinary }) {
     try {
         if (inWorker)
             importScripts(moduleName + '.js');
+        emModule.stdin = function () {
+                // Return ASCII code of character, or null if no input remains
+                    if (i < inputText.length) {
+                        let c = inputText.charCodeAt(i++);
+                        return c;
+                    } else 
+                        return null;
+        };
         let binary = new Uint8Array(wasmBinary);
         let { standardSections, relocs, linking } = getSegments(binary);
         let { dataSize, initFunctions } = getLinkingInfo(binary, linking)
@@ -105,8 +116,9 @@ commands.start = async function ({ moduleName, wasmBinary }) {
     }
 };
 
-commands.run = async function ({ wasmBinary }) {
+commands.run = async function ({ wasmBinary, userInput }) {
     try {
+        inputText = userInput;
         let binary = new Uint8Array(wasmBinary);
         let rtlExports = emModule.wasmInstance.exports;
         let memory = emModule.wasmMemory;

src/process.js

@@ -116,7 +116,7 @@ let emModule = {
 
     async compileWasm() {
         let hash, cacheResult;
-        if (crypto.subtle) {
+        if (typeof crypto !== "undefined" && crypto.subtle) {
             hash = await crypto.subtle.digest('SHA-512', this.wasmBinary);
             cacheResult = await checkCache(this.moduleName, hash);
         } else {