Merge pull request #1035 from bytecodealliance/main

Merge main into dev/socket_api

Author: wenyongh

.github/workflows/compilation_on_android_ubuntu_macos.yml

@@ -11,13 +11,15 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_android_ubuntu_macos.yml"
   # will be triggered on push events
   push:
     paths-ignore:
       - "assembly-script/**"
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_android_ubuntu_macos.yml"
   # allow to be triggered manually
   workflow_dispatch:
 
@@ -31,8 +33,8 @@ env:
   AOT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
   CLASSIC_INTERP_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
   FAST_INTERP_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=1 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
-  JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
   LAZY_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=1"
+  MC_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
   LLVM_CACHE_SUFFIX: "build-llvm_libraries_ex"
 
 jobs:
@@ -193,8 +195,8 @@ jobs:
             # Running mode
             $CLASSIC_INTERP_BUILD_OPTIONS,
             $FAST_INTERP_BUILD_OPTIONS,
-            $JIT_BUILD_OPTIONS,
             $LAZY_JIT_BUILD_OPTIONS,
+            $MC_JIT_BUILD_OPTIONS,
             $AOT_BUILD_OPTIONS,
           ]
         make_options_feature: [
@@ -232,11 +234,11 @@ jobs:
             make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
           # uncompatiable mode and feature
           # MULTI_MODULE only on INTERP mode
-          - make_options_run_mode: $JIT_BUILD_OPTIONS
+          - make_options_run_mode: $LAZY_JIT_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=1"
           - make_options_run_mode: $AOT_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=1"
-          - make_options_run_mode: $LAZY_JIT_BUILD_OPTIONS
+          - make_options_run_mode: $MC_JIT_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_MULTI_MODULE=1"
           # SIMD only on JIT/AOT mode
           - make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
@@ -246,10 +248,10 @@ jobs:
           # DEBUG_INTERP only on CLASSIC INTERP mode
           - make_options_run_mode: $AOT_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
-          - make_options_run_mode: $JIT_BUILD_OPTIONS
-            make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
           - make_options_run_mode: $LAZY_JIT_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
+          - make_options_run_mode: $MC_JIT_BUILD_OPTIONS
+            make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
           - make_options_run_mode: $FAST_INTERP_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_DEBUG_INTERP=1"
           # DEBUG_AOT only on JIT/AOT mode
@@ -258,17 +260,17 @@ jobs:
           - make_options_run_mode: $FAST_INTERP_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
           # TODO: DEBUG_AOT on JIT
-          - make_options_run_mode: $JIT_BUILD_OPTIONS
-            make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
           - make_options_run_mode: $LAZY_JIT_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
+          - make_options_run_mode: $MC_JIT_BUILD_OPTIONS
+            make_options_feature: "-DWAMR_BUILD_DEBUG_AOT=1"
           # MINI_LOADER only on INTERP mode
           - make_options_run_mode: $AOT_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
-          - make_options_run_mode: $JIT_BUILD_OPTIONS
-            make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
           - make_options_run_mode: $LAZY_JIT_BUILD_OPTIONS
             make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
+          - make_options_run_mode: $MC_JIT_BUILD_OPTIONS
+            make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
         include:
           - os: ubuntu-18.04
             light: ${{ needs.check_repo.outputs.traffic_light_on_ubuntu_1804 }}
@@ -318,8 +320,8 @@ jobs:
             # Running mode
             $CLASSIC_INTERP_BUILD_OPTIONS,
             $FAST_INTERP_BUILD_OPTIONS,
-            $JIT_BUILD_OPTIONS,
             $LAZY_JIT_BUILD_OPTIONS,
+            $MC_JIT_BUILD_OPTIONS,
             $AOT_BUILD_OPTIONS,
           ]
         os: [ubuntu-18.04, ubuntu-20.04, macos-latest]
@@ -339,11 +341,11 @@ jobs:
         exclude:
           # TODO: a .aot compatiable problem
           - os: macos-latest
-            make_options: $JIT_BUILD_OPTIONS
+            make_options: $LAZY_JIT_BUILD_OPTIONS
           - os: macos-latest
             make_options: $AOT_BUILD_OPTIONS
           - os: macos-latest
-            make_options: $LAZY_JIT_BUILD_OPTIONS
+            make_options: $MC_JIT_BUILD_OPTIONS
     steps:
       - name: light status
         run: echo "matrix.os=${{ matrix.os }}, light=${{ matrix.light }}"

.github/workflows/compilation_on_sgx.yml

@@ -11,13 +11,15 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_sgx.yml"
   # will be triggered on push events
   push:
     paths-ignore:
       - "assembly-script/**"
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_sgx.yml"
   # allow to be triggered manually
   workflow_dispatch:
 
@@ -31,8 +33,8 @@ env:
   AOT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
   CLASSIC_INTERP_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
   FAST_INTERP_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=1 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
-  JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
   LAZY_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=1"
+  MC_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
   LLVM_CACHE_SUFFIX: "build-llvm_libraries_ex"
 
 jobs:
@@ -116,8 +118,8 @@ jobs:
             $CLASSIC_INTERP_BUILD_OPTIONS,
             $FAST_INTERP_BUILD_OPTIONS,
             # doesn't support
-            # $JIT_BUILD_OPTIONS,
             # $LAZY_JIT_BUILD_OPTIONS,
+            # $MC_JIT_BUILD_OPTIONS,
             $AOT_BUILD_OPTIONS,
           ]
         make_options_feature: [
@@ -208,8 +210,8 @@ jobs:
             $CLASSIC_INTERP_BUILD_OPTIONS,
             $FAST_INTERP_BUILD_OPTIONS,
             # doesn't support
-            #$JIT_BUILD_OPTIONS,
             #$LAZY_JIT_BUILD_OPTIONS,
+            #$MC_JIT_BUILD_OPTIONS,
             #$AOT_BUILD_OPTIONS,
           ]
         os: [ubuntu-20.04]

.github/workflows/compilation_on_windows.yml

@@ -11,13 +11,15 @@ on:
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_windows.yml"
   # will be triggered on push events
   push:
     paths-ignore:
       - "assembly-script/**"
       - "ci/**"
       - "doc/**"
       - "test-tools/**"
+      - ".github/workflows/compilation_on_windows.yml"
   # allow to be triggered manually
   workflow_dispatch:
 

.github/workflows/spec_test.yml

@@ -13,6 +13,7 @@ on:
       - "product-mini/**"
       - "tests/wamr-test-suites/spec-test-script/**"
       - "tests/wamr-test-suites/test_wamr.sh"
+      - ".github/workflows/spec_test.yml"
   # will be triggered on push events
   push:
     paths:
@@ -23,6 +24,7 @@ on:
       - "product-mini/**"
       - "tests/wamr-test-suites/spec-test-script/**"
       - "tests/wamr-test-suites/test_wamr.sh"
+      - ".github/workflows/spec_test.yml"
   # allow to be triggered manually
   workflow_dispatch:
 
@@ -140,7 +142,13 @@ jobs:
         run: echo "::error::can not get prebuilt llvm libraries" && exit 1
 
       - name: install Ninja and x32 support libraries
-        run: sudo apt install -y g++-multilib libgcc-9-dev lib32gcc-9-dev ninja-build
+        run:
+            # Add another apt repository as some packages cannot
+            # be downloaded with the github default repository
+            sudo curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc &&
+            sudo apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod &&
+            sudo apt-get update &&
+            sudo apt install -y g++-multilib lib32gcc-9-dev ninja-build
 
       - name: run spec tests
         run: ./test_wamr.sh ${{ env.X86_32_TARGET_TEST_OPTIONS }} ${{ matrix.test_option }}

.gitignore

@@ -1,4 +1,4 @@
-
+.cache
 .vs
 .vscode
 /.idea
@@ -22,3 +22,5 @@ product-mini/platforms/linux-sgx/enclave-sample/iwasm
 
 build_out
 tests/wamr-test-suites/workspace
+
+!/test-tools/wamr-ide/VSCode-Extension/.vscode

ATTRIBUTIONS.md

@@ -5,7 +5,7 @@ WAMR project reused some components from other open source project:
 - **cJson**: used in the host_tool for remotely managing wasm applications
 - **contiki-ng**: for the coap protocol implementation
 - **freebsd libm**: used in core/shared/platform/alios/bh_math.c
-- **littlevgl**: for the gui samples and wrapped the wasm graphic layer
+- **LVGL**: for the gui samples and wrapped the wasm graphic layer
 - **llvm**: for the AOT/JIT compilation
 - **wasm-c-api**: to implement the C-APIs of wasm. using headers and sameples
 - **wasmtime**: for the wasi libc implementation
@@ -19,7 +19,7 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
 | cjson | 1.7.10 | 1.7.14 | https://github.com/DaveGamble/cJSON | https://www.cvedetails.com/vendor/19164/Cjson-Project.html |
 | contiki-ng (er-coap) | unspecified | 3.0 | https://github.com/contiki-os/contiki | https://www.cvedetails.com/vendor/16528/Contiki-os.html |
 | freebsd libm | unspecified | 13.0 | https://www.freebsd.org/ | https://www.cvedetails.com/vendor/6/Freebsd.html |
-| littlevgl | 6.0.1 | 7.11.0 | https://lvgl.io/ | |
+| LVGL | 6.0.1 | 7.11.0 | https://lvgl.io/ | |
 | llvm | 11.0.1 | 12.0.0 | https://llvm.org | https://www.cvedetails.com/vendor/13260/Llvm.html |
 | wasm-c-api | ac9b509f4df86e40e56e9b01f3f49afab0100037 | c9d31284651b975f05ac27cee0bab1377560b87e | https://github.com/WebAssembly/wasm-c-api | |
 | wasmtime | unspecified | v0.26.0 | https://github.com/bytecodealliance/wasmtime | |
@@ -40,11 +40,11 @@ The WAMR fast interpreter is a clean room development. We would acknowledge the
 
 [COPYRIGHT](./core/shared/platform/common/math/COPYRIGHT)
 
-### littlevgl
+### LVGL
 
-[LICENCE](./samples/littlevgl/LICENCE.txt)
+[LICENSE](./samples/littlevgl/LICENCE.txt)
 
-[LICENSE](./core/deps/lvgl/LICENCE.txt)
+[LICENSE](./core/app-framework/wgl/app/wa-inc/lvgl/LICENCE.txt)
 
 ### llvm
 

CMakeLists.txt

@@ -130,6 +130,10 @@ add_library (iwasm_shared SHARED ${WAMR_RUNTIME_LIB_SOURCE})
 set_target_properties (iwasm_shared PROPERTIES OUTPUT_NAME iwasm)
 target_link_libraries (iwasm_shared ${LLVM_AVAILABLE_LIBS} ${UV_A_LIBS} -lm -ldl -lpthread)
 
+if (MINGW)
+target_link_libraries (iwasm_shared -lWs2_32)
+endif ()
+
 install (TARGETS iwasm_shared LIBRARY DESTINATION lib)
 
 # HEADERS