Merge pull request #13 from seanyoung/inkwell

Inkwell

Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Sean Young <sean@mess.org>"]
 homepage = "https://github.com/hyperledger-labs/solang"
 license = "Apache-2.0 OR MIT"
 build = "build.rs"
-description = "Solidity to WASM Smart Contracts Compiler"
+description = "Solidity to WASM Smart Contract Compiler"
 
 [build-dependencies]
 lalrpop = "0.17.0"
@@ -13,7 +13,7 @@ lalrpop = "0.17.0"
 [dependencies]
 lalrpop-util = "0.17.0"
 regex = "0.2.1"
-llvm-sys = "80"
+inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm8-0" }
 num-bigint = "0.2"
 num-traits = "0.2.6"
 parity-wasm = "0.35"

Dockerfile

@@ -13,16 +13,15 @@ MAINTAINER Sean Young <sean@mess.org>
 RUN apt-get update
 RUN apt-get install -y cargo llvm-8-dev clang-8 libz-dev
 
-RUN mkdir -p src/
-COPY . src/
+COPY src src/src/
+COPY stdlib src/stdlib/
+COPY build.rs Cargo.toml src/
 WORKDIR /src/stdlib/
 RUN clang-8 --target=wasm32 -c -emit-llvm -O3 -ffreestanding -fno-builtin -Wall stdlib.c
 
 WORKDIR /src/
 RUN cargo build --release
 
-# Something more minimal than Fedora would be nice. Alphine won't work
-# since we built solang with glibc, not musl.
 FROM ubuntu:18.04
 COPY --from=builder /src/target/release/solang /usr/bin/solang
 

src/main.rs

@@ -4,7 +4,6 @@ extern crate ethereum_types;
 extern crate hex;
 extern crate lalrpop_util;
 extern crate lazy_static;
-extern crate llvm_sys;
 extern crate num_bigint;
 extern crate num_traits;
 extern crate parity_wasm;
@@ -12,6 +11,7 @@ extern crate serde;
 extern crate tiny_keccak;
 extern crate unescape;
 extern crate wasmi;
+extern crate inkwell;
 
 use clap::{App, Arg};
 mod ast;
@@ -150,16 +150,12 @@ fn main() {
             let contract = emit::Contract::new(contract, &filename);
 
             if let Some("llvm") = matches.value_of("EMIT") {
-                contract.dump_llvm();
+                contract.dump_llvm(&output_file(&contract.name, "ll")).unwrap();
                 continue;
             }
 
             if let Some("bc") = matches.value_of("EMIT") {
-                let bc = contract.bitcode();
-                let bc_filename = output_file(&contract.name, "bc");
-
-                let mut file = File::create(bc_filename).unwrap();
-                file.write_all(&bc).unwrap();
+                contract.bitcode(&output_file(&contract.name, "bc"));
                 continue;
             }
 

stdlib/stdlib.c

@@ -17,6 +17,18 @@ extern void get_storage32(uint32_t key, void *dest, int32_t length);
 extern void set_storage32(uint32_t key, void *src, int32_t length);
 
 
+/*
+ */
+__attribute__((visibility("hidden")))
+void __memset8(void *_dest, uint64_t val, size_t length)
+{
+	uint64_t *dest = _dest;
+
+	do {
+		*dest++ = val;
+	} while (--length);
+}
+
 /*
  * Our memcpy can only deal with multiples of 8 bytes. This is enough for
  * simple allocator below.