更新硬件SDK

sdk/合宙/air780e/csdk/luatos-soc-2022/thirdparty/miniz/LICENSE

@@ -0,0 +1,22 @@
+Copyright 2013-2014 RAD Game Tools and Valve Software
+Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

sdk/合宙/air780e/csdk/luatos-soc-2022/thirdparty/miniz/luat_transz.c

@@ -0,0 +1,159 @@
+#include "luat_transz.h"
+#include "miniz.h"
+#include <stdio.h>
+
+#include "common_api.h"
+
+#define TZ_MALLOC malloc
+#define TZ_FREE   free
+#define TZ_MEMCPY memcpy
+#define TZ_MEMSET memset
+
+#pragma GCC push_options
+#pragma GCC optimize ("O3")
+
+// size_t cache_match = 0;
+
+static char cache_buff[4096];
+static luat_transz_cache_t _cache = {
+    .addr = -1,
+    .data_ptr = NULL,
+};
+static luat_transz_cache_t* cache = &_cache;
+
+int luat_transz_read(luat_transz_data_t* data, uint8_t* buff, size_t offset, size_t len) {
+    //int ret = 0;
+    uint8_t* tmp = NULL;
+    uint8_t* dst = buff;
+    size_t block_index = 0;
+    size_t tmp_size = 0;
+    size_t block_size = 0;
+    size_t origin_len = len;
+    // 先防御一波
+    if (data == NULL)
+        return -1;
+    if (buff == NULL)
+        return -2;
+    if (len == 0) {
+        DBG("%s:%d what1", __FILE__, __LINE__);
+        return 0;
+    }
+    if (offset >= data->total_size) {
+        DBG("%s:%d what2 %d %d", __FILE__, __LINE__, offset, data->total_size);
+        return 0;
+    }
+    if (cache->buff == NULL) {
+        cache->buff = TZ_MALLOC(4096);
+    }
+
+    if (offset + len >= data->total_size) {
+        len = data->total_size - offset;
+    }
+    //DBG("mode %d offset %d len %d", data->compress_mode, offset, len);
+    if (data->compress_mode == TZ_COMPRESS_NONE) {
+        // printf("data[0] %p", data->data[0]);
+        // printf("data[0][8] %p", data->data[0][8]);
+        TZ_MEMCPY(buff, data->datas + offset, len);
+        return len;
+    }
+
+    block_size = data->block_size;
+
+    //DBG("offset %08X len %08X", offset, len);
+    if (cache == NULL) {
+        tmp = TZ_MALLOC(block_size);
+        if (tmp == NULL) {
+            return -3;
+        }
+    }
+    else {
+        tmp = cache->buff;
+    }
+        
+    uint16_t* flags = (uint16_t*)data->fragments;
+
+    while (len > 0) {
+        // 首先, 解压对应的块
+        block_index = offset / block_size;
+        size_t block_offset = 0;
+        for (size_t i = 0; i < block_index; i++)
+        {
+            block_offset += flags[i];
+        }
+        //DBG("block index %d offset %04X size %04X", block_index, block_offset, flags[block_index]);
+        
+        //DBG("block_index %d", block_index);
+        //DBG("data->fragments %p", data->fragments);
+        if (cache == NULL || cache->addr != block_index) {
+            //DBG("cache miss, do decompress");
+            memcpy(cache_buff, data->datas + block_offset + 2, flags[block_index] - 2);
+            tmp_size = tinfl_decompress_mem_to_mem(tmp, block_size, cache_buff,
+                                    flags[block_index] - 2
+                                    , 0
+                                    );
+            //DBG("cache miss, do decompress %d", tmp_size);
+            if (cache != NULL) {
+                // 无论解压是否成功,cache的数据已经污染,修改地址
+                if (tmp_size == TINFL_DECOMPRESS_MEM_TO_MEM_FAILED) {
+                    cache->addr = -1;
+                }
+                else
+                    cache->addr = block_index;
+            } 
+        }
+        else {
+            //DBG("cache hit, skip decompress");
+            tmp_size = 0;
+        }
+        // 解压完成, 判断一下大小
+        if (tmp_size == TINFL_DECOMPRESS_MEM_TO_MEM_FAILED) {
+            if (cache != NULL)
+                TZ_FREE(tmp); // 如果cache存在, 那么tmp就不是malloc的
+            return -4;
+        }
+        // 开始分情况拷贝数据了
+        if (offset % block_size == 0) {
+            // 处于块的开头, 当前是对齐的状态
+            //DBG("%s:%d offset %d len %d", __FILE__, __LINE__, offset, len);
+            if (len > block_size) {
+                TZ_MEMCPY(dst, tmp, block_size);
+                offset += block_size;
+                dst += block_size;
+                len -= block_size;
+            }
+            else {
+                TZ_MEMCPY(dst, tmp, len);
+                offset += len;
+                dst += len;
+                len = 0;
+                break; // 结束了
+            }
+        }
+        else {
+            // 未对齐的状态, 拷贝并移动到对齐的位置
+            size_t tmpoffset = offset % block_size;
+            if (tmpoffset + len > block_size) {
+                //DBG("cross block %d %d %d", tmpoffset, offset, len);
+                // 未对齐, 还跨块
+                TZ_MEMCPY(dst, tmp + tmpoffset, block_size - tmpoffset);
+                offset += block_size - tmpoffset;
+                dst += block_size - tmpoffset;
+                len -= block_size - tmpoffset;
+            }
+            else {
+                // 未对齐但不跨块, 那肯定只有一个数据
+                TZ_MEMCPY(dst, tmp + tmpoffset, len);
+                offset += len;
+                dst += len;
+                len = 0;
+                break; // 结束了
+            }
+        }
+    }
+    if (cache == NULL)
+        TZ_FREE(tmp);
+    // 一切正常
+    //DBG("%s:%d what3", __FILE__, __LINE__);
+    return dst - buff;
+}
+#pragma GCC pop_options

sdk/合宙/air780e/csdk/luatos-soc-2022/thirdparty/miniz/luat_transz.h

@@ -0,0 +1,29 @@
+
+#include "stdlib.h"
+#include "stdint.h"
+
+enum TZ_COMPRESS_MODE {
+    TZ_COMPRESS_NONE = 0,
+    TZ_COMPRESS_GZ   = 1
+};
+
+typedef struct luat_transz_cache
+{
+    const char *data_ptr; // 需指向luat_transz_data_t.datas, 如不相同,会禁用cache
+    int   addr;           // luat_transz_read 函数自行维护的块地址,第一次传入时应该设置为-1
+    char *buff; // 按实际block_size长度进行malloc
+}luat_transz_cache_t;
+
+
+typedef struct luat_transz_data
+{
+    size_t total_size;
+    size_t block_size;
+    size_t compress_mode;
+    const char *fragments;
+    const char *datas;
+}luat_transz_data_t;
+
+
+int luat_transz_read(luat_transz_data_t* data, uint8_t* buff, size_t offset, size_t len);
+

sdk/合宙/air780e/csdk/luatos-soc-2022/thirdparty/miniz/xmake.lua

@@ -0,0 +1,17 @@
+
+target("miniz")
+    local LIB_DIR = "$(buildir)/miniz/"
+    set_kind("static")
+    set_targetdir(LIB_DIR)
+    
+    --加入代码和头文件
+    add_includedirs(SDK_TOP .. "thirdparty/miniz",{public = true})
+    add_files("./*.c",{public = true})
+    --路径可以随便写,可以加任意路径的代码,下面代码等效上方代码
+    -- add_includedirs(SDK_TOP .. "project/" .. TARGET_NAME .. "/inc",{public = true})
+    -- add_files(SDK_TOP .. "project/" .. TARGET_NAME .. "/src/*.c",{public = true})
+    
+    --可以继续增加add_includedirs和add_files
+    --自动链接
+    LIB_USER = LIB_USER .. SDK_TOP .. LIB_DIR .. "libminiz.a "
+target_end()