From dacb3c4105adcd3d7db90516dc2ddf7118a8d394 Mon Sep 17 00:00:00 2001
From: dongheng <930490596@qq.com>
Date: Mon, 8 Apr 2024 12:34:08 +0800
Subject: [PATCH] Add wamr to esp-idf components registry (#3287)

This PR is for the main branch, but only the released branch will be pushed
into Espressif component registry.

See also similar fixes in branch release/1.3.x:
https://github.com/bytecodealliance/wasm-micro-runtime/pull/3264
https://github.com/bytecodealliance/wasm-micro-runtime/pull/3288
---
 CMakeLists.txt                                |  5 +++++
 core/shared/platform/esp-idf/espidf_memmap.c  | 19 ++++++++++++++++++-
 idf_component.yml                             |  8 ++++++++
 product-mini/platforms/esp-idf/CMakeLists.txt |  3 ---
 .../platforms/esp-idf/main/CMakeLists.txt     |  3 +--
 .../platforms/esp-idf/main/idf_component.yml  |  7 +++++++
 product-mini/platforms/esp-idf/main/main.c    |  4 ----
 7 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 idf_component.yml
 create mode 100644 product-mini/platforms/esp-idf/main/idf_component.yml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8df86ddd0..0ffba05a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,11 @@
 
 cmake_minimum_required (VERSION 3.0)
 
+if(ESP_PLATFORM)
+  include (${COMPONENT_DIR}/build-scripts/esp-idf/wamr/CMakeLists.txt)
+  return()
+endif()
+
 project (iwasm)
 
 set (CMAKE_VERBOSE_MAKEFILE OFF)
diff --git a/core/shared/platform/esp-idf/espidf_memmap.c b/core/shared/platform/esp-idf/espidf_memmap.c
index 6b1b6f045..21f186b90 100644
--- a/core/shared/platform/esp-idf/espidf_memmap.c
+++ b/core/shared/platform/esp-idf/espidf_memmap.c
@@ -55,7 +55,24 @@ os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
 #else
         uint32_t mem_caps = MALLOC_CAP_8BIT;
 #endif
-        return heap_caps_malloc(size, mem_caps);
+        void *buf_origin =
+            heap_caps_malloc(size + 4 + sizeof(uintptr_t), mem_caps);
+        if (!buf_origin) {
+            return NULL;
+        }
+
+        // Memory allocation with MALLOC_CAP_SPIRAM or MALLOC_CAP_8BIT will
+        // return 4-byte aligned Reserve extra 4 byte to fixup alignment and
+        // size for the pointer to the originally allocated address
+        void *buf_fixed = buf_origin + sizeof(void *);
+        if ((uintptr_t)buf_fixed & (uintptr_t)0x7) {
+            buf_fixed = (void *)((uintptr_t)(buf_fixed + 4) & (~(uintptr_t)7));
+        }
+
+        uintptr_t *addr_field = buf_fixed - sizeof(uintptr_t);
+        *addr_field = (uintptr_t)buf_origin;
+
+        return buf_fixed;
     }
 }
 
diff --git a/idf_component.yml b/idf_component.yml
new file mode 100644
index 000000000..a35cf79b3
--- /dev/null
+++ b/idf_component.yml
@@ -0,0 +1,8 @@
+version: "2.0.0"
+description: WebAssembly Micro Runtime - A lightweight standalone WebAssembly (Wasm) runtime with small footprint, high performance and highly configurable features
+url: https://bytecodealliance.org/
+repository: https://github.com/bytecodealliance/wasm-micro-runtime.git
+documentation: https://wamr.gitbook.io/
+issues: https://github.com/bytecodealliance/wasm-micro-runtime/issues
+dependencies:
+  idf: ">=4.4"
\ No newline at end of file
diff --git a/product-mini/platforms/esp-idf/CMakeLists.txt b/product-mini/platforms/esp-idf/CMakeLists.txt
index d8a3d2f96..8472df8dd 100644
--- a/product-mini/platforms/esp-idf/CMakeLists.txt
+++ b/product-mini/platforms/esp-idf/CMakeLists.txt
@@ -6,7 +6,4 @@ cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-set (COMPONENTS ${IDF_TARGET} main freertos esptool_py wamr)
-list(APPEND EXTRA_COMPONENT_DIRS "$ENV{WAMR_PATH}/build-scripts/esp-idf")
-
 project(wamr-simple)
\ No newline at end of file
diff --git a/product-mini/platforms/esp-idf/main/CMakeLists.txt b/product-mini/platforms/esp-idf/main/CMakeLists.txt
index 55e725670..1bb61bad9 100644
--- a/product-mini/platforms/esp-idf/main/CMakeLists.txt
+++ b/product-mini/platforms/esp-idf/main/CMakeLists.txt
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 idf_component_register(SRCS "main.c"
-                    INCLUDE_DIRS "."
-                    REQUIRES wamr)
+                    INCLUDE_DIRS ".")
diff --git a/product-mini/platforms/esp-idf/main/idf_component.yml b/product-mini/platforms/esp-idf/main/idf_component.yml
new file mode 100644
index 000000000..da64aa37d
--- /dev/null
+++ b/product-mini/platforms/esp-idf/main/idf_component.yml
@@ -0,0 +1,7 @@
+## IDF Component Manager Manifest File
+dependencies:
+  wasm-micro-runtime:
+    version: ">=2.0"
+    override_path: "../../../.."
+  idf:
+    version: ">=4.4"
\ No newline at end of file
diff --git a/product-mini/platforms/esp-idf/main/main.c b/product-mini/platforms/esp-idf/main/main.c
index fbfb04c21..1a34096d7 100644
--- a/product-mini/platforms/esp-idf/main/main.c
+++ b/product-mini/platforms/esp-idf/main/main.c
@@ -12,11 +12,7 @@
 
 #include "esp_log.h"
 
-#ifdef CONFIG_IDF_TARGET_ESP32S3
 #define IWASM_MAIN_STACK_SIZE 5120
-#else
-#define IWASM_MAIN_STACK_SIZE 4096
-#endif
 
 #define LOG_TAG "wamr"