remove deprecated allocateUTF8

Signed-off-by: Yuchen Liang <[email protected]>

Author: yliang412

tools/wasm-bpt-printer/CMakeLists.txt

@@ -4,5 +4,5 @@ if(EMSCRIPTEN)
     add_executable(wasm-bpt-printer ${WASM_SHELL_SOURCES})
     target_link_libraries(wasm-bpt-printer bustub)
     set_target_properties(wasm-bpt-printer PROPERTIES OUTPUT_NAME bustub-wasm-bpt-printer)
-    target_link_options(wasm-bpt-printer PRIVATE -sEXPORTED_FUNCTIONS=['_BusTubInit','_BusTubApplyCommand','_free'] -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap','allocateUTF8','UTF8ToString'])
+    target_link_options(wasm-bpt-printer PRIVATE -sEXPORTED_FUNCTIONS=['_BusTubInit','_BusTubApplyCommand','_free','_malloc'] -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap','stringToUTF8','UTF8ToString'])
 endif()

tools/wasm-bpt-printer/extra_files/index.html

@@ -99,8 +99,8 @@
         const executeQuery = Module.cwrap('BusTubApplyCommand', 'number', ['string', 'number', 'number'])
         window.executeQuery = (x) => {
             const bufferSize = 64 * 1024
-            let output = "\0".repeat(bufferSize)
-            let ptrOutput = Module.allocateUTF8(output)
+            const ptrOutput = Module._malloc(bufferSize)
+            Module.stringToUTF8("", ptrOutput, bufferSize)
             const retCode = executeQuery(x, ptrOutput, bufferSize)
             output = Module.UTF8ToString(ptrOutput)
             Module._free(ptrOutput)
@@ -190,4 +190,4 @@
     gtag('config', 'UA-52525161-8');
 </script>
 
-</html>
+</html>

tools/wasm-shell/CMakeLists.txt

@@ -4,5 +4,5 @@ if(EMSCRIPTEN)
     add_executable(wasm-shell ${WASM_SHELL_SOURCES})
     target_link_libraries(wasm-shell bustub)
     set_target_properties(wasm-shell PROPERTIES OUTPUT_NAME bustub-wasm-shell)
-    target_link_options(wasm-shell PRIVATE -sEXPORTED_FUNCTIONS=['_BusTubInit','_BusTubExecuteQuery','_free'] -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap','allocateUTF8','UTF8ToString'])
+    target_link_options(wasm-shell PRIVATE -sEXPORTED_FUNCTIONS=['_BusTubInit','_BusTubExecuteQuery','_free','_malloc'] -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap','stringToUTF8','UTF8ToString'])
 endif()

tools/wasm-shell/extra_files/index.html

@@ -85,10 +85,10 @@
         const initialize = Module.cwrap('BusTubInit', 'number', [])
         window.executeQuery = (x) => {
             const bufferSize = 64 * 1024
-            let output = "\0".repeat(bufferSize)
-            let ptrOutput = Module.allocateUTF8(output)
-            let output2 = "\0".repeat(bufferSize)
-            let ptrOutput2 = Module.allocateUTF8(output2)
+            const ptrOutput = Module._malloc(bufferSize)
+            Module.stringToUTF8("", ptrOutput, bufferSize)
+            const ptrOutput2 = Module._malloc(bufferSize)
+            Module.stringToUTF8("", ptrOutput2, bufferSize)
             const retCode = executeQuery(x, ptrOutput2, ptrOutput, bufferSize)
             output = Module.UTF8ToString(ptrOutput)
             output2 = Module.UTF8ToString(ptrOutput2)
@@ -159,4 +159,4 @@
     gtag('config', 'UA-52525161-8');
 </script>
 
-</html>
+</html>