Enable tests for stdlib (hyperledger-solang#1299)

* Enable tests for stdlib

Signed-off-by: Lucas Steuernagel <[email protected]>

Author: LucasSte

.github/workflows/test.yml

@@ -366,3 +366,19 @@ jobs:
       working-directory: ./vscode
     - run: vsce package
       working-directory: ./vscode
+
+  std-lib-tests:
+    name: Stdlib
+    runs-on: solang-ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+      - name: Lints for stdlib
+        run: |
+          make lint
+        working-directory: ./stdlib
+      - name: Stdlib tests
+        run: |
+          make test
+          ./test
+        working-directory: ./stdlib

build.rs

@@ -5,6 +5,11 @@ use std::process::Command;
 fn main() {
     #[cfg(feature = "llvm")]
     {
+        Command::new("make")
+            .args(["-C", "stdlib"])
+            .output()
+            .expect("Could not build stdlib");
+
         // compile our linker
         let cxxflags = Command::new("llvm-config")
             .args(["--cxxflags"])

docs/installing.rst

@@ -197,7 +197,7 @@ And on Windows, assuming *installdir* was ``C:\Users\User\solang-llvm``:
 Step 2: Build Solang
 ____________________
 
-Once you have the correct LLVM version in your path, simply run:
+Once you have the correct LLVM version in your path, ensure you have GNU make installed and simply run:
 
 .. code-block:: bash
 
@@ -213,7 +213,7 @@ Alternative step 2: Build Solang from crates.io
 _______________________________________________
 
 The latest Solang release is  on `crates.io <https://crates.io/crates/solang>`_. Once you have the
-correct LLVM version in your path, simply run:
+correct LLVM version in your path, ensure you have GNU make installed and simply run:
 
 .. code-block:: bash
 

stdlib/.clang-format

@@ -0,0 +1,3 @@
+ReflowComments: false
+BasedOnStyle: Microsoft
+SortIncludes: Never

stdlib/.gitignore

@@ -0,0 +1,2 @@
+wasm/
+bpf/

stdlib/Makefile

@@ -2,18 +2,32 @@ CC=clang
 BIT_INT_FLAGS=-Xclang -fexperimental-max-bitint-width=512
 CFLAGS=$(TARGET_FLAGS) -emit-llvm -O3 -ffreestanding -fno-builtin -Wall -Wno-unused-function $(BIT_INT_FLAGS)
 
-bpf/%.bc wasm/%.bc: %.c
+bpf/%.bc: %.c
+	$(CC) -c $(CFLAGS) $< -o $@
+
+wasm/%.bc: %.c
 	$(CC) -c $(CFLAGS) $< -o $@
 
 SOLANA=$(addprefix bpf/,solana.bc bigint.bc format.bc stdlib.bc ripemd160.bc heap.bc)
 WASM=$(addprefix wasm/,ripemd160.bc stdlib.bc bigint.bc format.bc heap.bc)
 
 all: $(SOLANA) $(WASM)
 
+$(SOLANA) $(WASM): | outputs_dirs
+
 $(SOLANA): TARGET_FLAGS=--target=sbf
 $(WASM): TARGET_FLAGS=--target=wasm32
 
-bpf/solana.bc: solana.c solana_sdk.h
+bpf/solana.bc: solana.c solana_sdk.h | outputs_dirs
+
+outputs_dirs:
+	@mkdir -p bpf wasm
 
 clean:
-	rm -r bpf/* wasm/*
+	rm -rf bpf wasm
+
+test:
+	clang -DTEST -DSOL_TEST -O3 -Wall solana.c stdlib.c -o test
+
+lint:
+	clang-format *.c *.h --style=file --dry-run -Werror

stdlib/bigint.c

@@ -120,8 +120,7 @@ bool __mul32_with_builtin_ovf(uint32_t left[], uint32_t right[], uint32_t out[],
 // Some compiler runtime builtins we need.
 
 // 128 bit shift left.
-typedef union
-{
+typedef union {
     __uint128_t all;
     struct
     {
@@ -131,8 +130,7 @@ typedef union
 } two64;
 
 // 128 bit shift left.
-typedef union
-{
+typedef union {
     __int128_t all;
     struct
     {

stdlib/bpf/bigint.bc

@@ -109,7 +109,8 @@ char *uint2dec(char *output, uint64_t val)
     return output;
 }
 
-extern int udivmod128(const __uint128_t *dividend, const __uint128_t *divisor, __uint128_t *remainder, __uint128_t *quotient);
+extern int udivmod128(const __uint128_t *dividend, const __uint128_t *divisor, __uint128_t *remainder,
+                      __uint128_t *quotient);
 
 char *uint128dec(char *output, __uint128_t val128)
 {
@@ -183,8 +184,7 @@ typedef unsigned _BitInt(256) uint256_t;
 
 extern int udivmod256(const uint256_t *dividend, const uint256_t *divisor, uint256_t *remainder, uint256_t *quotient);
 
-char *
-uint256dec(char *output, uint256_t *val256)
+char *uint256dec(char *output, uint256_t *val256)
 {
     // we want 1e19, how to declare such a constant in clang?
     const uint256_t n1e10 = 10000000000;
@@ -243,14 +243,14 @@ uint256dec(char *output, uint256_t *val256)
 static const char b58digits[] = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
 
 // https://github.com/bitcoin/libbase58/blob/b1dd03fa8d1be4be076bb6152325c6b5cf64f678/base58.c inspired this code.
-void base58_encode_solana_address(uint8_t * data, uint32_t data_len, uint8_t * output, uint32_t output_len)
+void base58_encode_solana_address(uint8_t *data, uint32_t data_len, uint8_t *output, uint32_t output_len)
 {
     uint32_t j, carry, zero_count = 0;
 
     while (zero_count < data_len && !data[zero_count])
         ++zero_count;
 
-    for (uint32_t i=zero_count, high = output_len - 1; i < data_len; i++, high = j)
+    for (uint32_t i = zero_count, high = output_len - 1; i < data_len; i++, high = j)
     {
         for (carry = data[i], j = output_len - 1; (j > high) || carry; --j)
         {
@@ -264,7 +264,7 @@ void base58_encode_solana_address(uint8_t * data, uint32_t data_len, uint8_t * o
         }
     }
 
-    for (j=0; j < output_len; j++)
+    for (j = 0; j < output_len; j++)
     {
         output[j] = b58digits[output[j]];
     }

stdlib/bpf/format.bc

@@ -33,8 +33,7 @@ void __init_heap()
     struct chunk *first = HEAP_START;
     first->next = first->prev = NULL;
     first->allocated = false;
-    first->length = (size_t)(__builtin_wasm_memory_size(0) * 0x10000 -
-                             (size_t)first - sizeof(struct chunk));
+    first->length = (size_t)(__builtin_wasm_memory_size(0) * 0x10000 - (size_t)first - sizeof(struct chunk));
 }
 #else
 #define HEAP_START ((struct chunk *)0x300000000)