Merge pull request #49 from NeverRaR/dev/runtime_test

fix: fix runtime c test
AntChainOpenLabs · Feb 21, 2024 · 985afce · 985afce
2 parents 8ed585b + e6e105e
commit 985afce
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 55 deletions.
diff --git a/smart_ir/src/runtime/stdlib/stdlib.c b/smart_ir/src/runtime/stdlib/stdlib.c
@@ -58,9 +58,9 @@ extern int32_t get_call_result_length(void);
 // get_call_result hostapi
 extern void get_call_result(char *result);
 
-uint256_t div256_u256_rem(uint256_t dividend, uint256_t divisor, uint256_t *remainder);
+extern uint256_t div256_u256_rem(uint256_t dividend, uint256_t divisor, uint256_t *remainder);
 
-uint256_t div256_u256(uint256_t dividend, uint256_t divisor);
+extern uint256_t div256_u256(uint256_t dividend, uint256_t divisor);
 
 void
 runtime_abort(char *msg, uint32_t msg_length,

diff --git a/smart_ir/src/runtime/stdlib/stdlib.h b/smart_ir/src/runtime/stdlib/stdlib.h
@@ -66,6 +66,11 @@ __strlen(const char *s);
 extern bool
 __memcmp(uint8_t *left, uint32_t left_len, uint8_t *right, uint32_t right_len);
 
+//bigint div
+uint256_t div256_u256_rem(uint256_t dividend, uint256_t divisor, uint256_t *remainder);
+
+uint256_t div256_u256(uint256_t dividend, uint256_t divisor);
+
 #ifndef CC_LIB_TEST_MOCK
 void *
 __malloc(size_t size);
@@ -94,11 +99,6 @@ __strtoi256(const char *__restrict nptr, char **__restrict endptr, int base);
 uint256_t
 __strtou256(const char *__restrict nptr, char **__restrict endptr, int base);
 
-//bigint div
-uint256_t div256_u256_rem(uint256_t dividend, uint256_t divisor, uint256_t *remainder);
-
-uint256_t div256_u256(uint256_t dividend, uint256_t divisor);
-
 #define malloc __malloc
 
 /*

diff --git a/smart_ir/src/runtime/stdlib/test/CMakeLists.txt b/smart_ir/src/runtime/stdlib/test/CMakeLists.txt
@@ -1,12 +1,30 @@
-# Copyright 2013 <chaishushan{AT}gmail.com>. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
+# Copyright 2013 <chaishushan{AT}gmail.com>. All rights reserved. Use of this
+# source code is governed by a BSD-style license that can be found in the
+# LICENSE file.
 
 cmake_minimum_required(VERSION 3.1)
 project(TEST)
 
 set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 \
+set(CMAKE_C_FLAGS
+    "${CMAKE_C_FLAGS} -std=c99 \
+    -Xclang \
+    -fexperimental-max-bitint-width=256 \
+    -Wno-int-conversion \
+    -Wno-pointer-sign \
+    -Wno-int-to-pointer-cast \
+    -Wno-extra-tokens \
+    -Wno-writable-strings \
+    -Wno-deprecated-declarations \
+    -Wno-incompatible-library-redeclaration \
+    -Wno-implicit-function-declaration \
+    -Wno-pragma-once-outside-header \
+    -Wno-pointer-to-int-cast")
+
+set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS}\
+    -Xclang \
+    -fexperimental-max-bitint-width=256 \
     -Wno-int-conversion \
     -Wno-pointer-sign \
     -Wno-int-to-pointer-cast \
@@ -21,51 +39,46 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 \
 add_definitions(-w)
 add_definitions(-DCC_LIB_TEST_MOCK)
 
-add_library(cc-test-lib
-        ir_c_mock.cc
-        ../base64.c
-        ../hex.c
-        ../call_log.c
-        ../stream.c
-        ../rlp.c
-        ../data_stream_builtin.c
-        ../data_stream.c
-        ../json.c
-        ../mycrypto.c
-        ../math.c
-        ../qhash.c
-        ../qhashtbl.c
-        ../qstring.c
-        ../qvector.c
-        ../stdlib.c
-        ../wasmheap.c
-        ../ir_type.c
-        ../ssz.c
-        ../chain.c
-        test.cc
-)
+add_library(
+  cc-test-lib
+  ir_c_mock.cc
+  ../base64.c
+  ../hex.c
+  ../call_log.c
+  ../stream.c
+  ../rlp.c
+  ../data_stream_builtin.c
+  ../data_stream.c
+  ../json.c
+  ../mycrypto.c
+  ../math.c
+  ../qhash.c
+  ../qhashtbl.c
+  ../qstring.c
+  ../qvector.c
+  ../stdlib.c
+  ../wasmheap.c
+  ../ir_type.c
+  ../ssz.c
+  ../chain.c
+  test.cc)
 
 set(CCTestSources
-        qhashtbl_test.cc
-        qstring_test.cc
-        qvector_test.cc
-        math_test.cc
-        base64_test.cc
-        hex_test.cc
-        ir_type_test.cc
-        rlp_test.cc
-        ssz-c/ssz_test.cc
-        ssz-c/ssz_contract_test.cc
-        ssz-c/ssz_contract_artifact_test.cc
-        ssz-c/ssz_account_test.cc)
-
-add_executable(cc-test
-	${CCTestSources}
-        test_main.cc
-)
+    qhashtbl_test.cc
+    qstring_test.cc
+    qvector_test.cc
+    math_test.cc
+    base64_test.cc
+    hex_test.cc
+    ir_type_test.cc
+    rlp_test.cc
+    ssz-c/ssz_test.cc
+    ssz-c/ssz_contract_test.cc
+    ssz-c/ssz_contract_artifact_test.cc
+    ssz-c/ssz_account_test.cc)
+
+add_executable(cc-test ${CCTestSources} test_main.cc)
 
-target_link_libraries(cc-test
-    cc-test-lib
-)
+target_link_libraries(cc-test cc-test-lib)
 
 include_directories(.)
diff --git a/smart_ir/src/runtime/stdlib/test/run_test.sh b/smart_ir/src/runtime/stdlib/test/run_test.sh
@@ -2,7 +2,7 @@
 set -e
 echo "building ir c lib unit tests"
 # need clang12. clang14 not supported i256/u256
-cmake -S . -B build -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_BUILD_TYPE=Debug
+cmake -S . -B build -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_BUILD_TYPE=Debug
 cmake --build build -j8
 PWD=`pwd`
 cd build