Fix package creation issue

.cargo/config.toml

@@ -12,6 +12,7 @@ rustflags = [
     "-Clink-arg=-sALLOW_TABLE_GROWTH=1",
     "-Clink-arg=--js-library=js/embed/soljson_interface.js",
     "-Clink-arg=--pre-js=js/embed/pre.js",
-    "-Clink-arg=-sSTACK_SIZE=128kb",
-    "-Clink-arg=-sNODEJS_CATCH_EXIT=0"
+    "-Clink-arg=-sNODEJS_CATCH_EXIT=0",
+    "-Clink-arg=-sDISABLE_EXCEPTION_CATCHING=0",
+    "-Copt-level=3"
 ]

.github/actions/get-emsdk/action.yml

@@ -1,19 +0,0 @@
-name: "Get Emscripten SDK"
-inputs:
-  version:
-    description: ""
-    required: false
-    default: "3.1.64"
-
-
-runs:
-  using: "composite"
-  steps:
-    - name: install emsdk
-      shell: bash
-      run: |
-        git clone https://github.com/emscripten-core/emsdk.git ./emsdk/
-        cd emsdk
-        git checkout tags/${{ inputs.version }}
-        ./emsdk install ${{ inputs.version }}
-        ./emsdk activate ${{ inputs.version }}

.github/actions/get-llvm/action.yml

@@ -1,70 +0,0 @@
-# example:
-#       - uses: ./.github/actions/get-llvm
-#         with:
-#           target: x86_64-unknown-linux-gnu
-
-name: "Download LLVM"
-inputs:
-  target:
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: find asset
-      id: find
-      uses: actions/github-script@v7
-      env:
-        target: ${{ inputs.target }}
-      with:
-        result-encoding: string
-        script: |
-          let page = 1;
-          let releases = [];
-
-          let releasePrefix = "llvm-"
-          let target = process.env.target
-
-          do {
-            const res = await github.rest.repos.listReleases({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              per_page: 50,
-              page,
-            });
-
-            releases = res.data
-            releases.sort((a, b) => {
-              return (a.published_at < b.published_at) ? 1 : ((a.published_at > b.published_at) ? -1 : 0);
-            });
-
-            let llvmLatestRelease = releases.find(release => {
-              return release.tag_name.startsWith(releasePrefix);
-            });
-            if (llvmLatestRelease){
-                let asset = llvmLatestRelease.assets.find(asset =>{
-                    return asset.name.includes(target);
-                });
-                if (!asset){
-                  core.setFailed(`Artifact for '${target}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
-                  process.exit();
-                }
-                return asset.browser_download_url;
-            }
-
-            page++;
-          } while(releases.length > 0);
-
-          core.setFailed(`No LLVM releases with '${releasePrefix}' atifacts found! Please release LLVM before running this workflow.`);
-          process.exit();
-
-    - name: download
-      shell: bash
-      run: |
-        curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
-
-    - name: unpack
-      shell: bash
-      run: |
-        tar -xf llvm.tar.gz
-        rm llvm.tar.gz

.github/actions/get-solc/action.yml

@@ -1,36 +0,0 @@
-name: "Install Solidity Compiler"
-description: "Installs the Ethereum solc Solidity compiler frontend executable"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Figure out Solc Download URL
-      shell: bash
-      run: |
-        if [[ "${{ runner.os }}" == "Linux" ]]; then
-          echo "SOLC_NAME=solc-static-linux" >> $GITHUB_ENV
-        elif [[ "${{ runner.os }}" == "Windows" ]]; then
-          echo "SOLC_NAME=solc-windows.exe" >> $GITHUB_ENV
-        else
-          echo "SOLC_NAME=solc-macos" >> $GITHUB_ENV
-        fi
-
-    - name: Download Solc
-      shell: bash
-      run: |
-        mkdir -p solc
-        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.29/${SOLC_NAME}
-
-    - name: Make Solc Executable
-      if: ${{ runner.os == 'Windows' }}
-      shell: bash
-      run: |
-        echo "$(pwd -W)\\solc" >> $GITHUB_PATH
-        mv solc/solc solc/solc.exe
-
-    - name: Make Solc Executable
-      if: ${{ runner.os != 'Windows' }}
-      shell: bash
-      run: |
-        echo "$(pwd)/solc" >> $GITHUB_PATH
-        chmod +x solc/solc

.github/scripts/json_generator.py

@@ -1,165 +0,0 @@
-import os
-import sys
-import json
-import requests
-
-def validate_github_token():
-    """Validate that GITHUB_TOKEN environment variable is set."""
-    if 'GITHUB_TOKEN' not in os.environ:
-        print("Error: GITHUB_TOKEN environment variable is not set.")
-        sys.exit(1)
-
-def fetch_release_data(repo, tag):
-    """Fetch release data from GitHub API."""
-    url = f"https://api.github.com/repos/{repo}/releases/tags/{tag}"
-    headers = {
-        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
-        'Accept': 'application/vnd.github+json',
-        'X-GitHub-Api-Version': '2022-11-28'
-    }
-
-    try:
-        response = requests.get(url, headers=headers)
-        response.raise_for_status()
-        return response.json()
-    except requests.RequestException as e:
-        print(f"Error fetching release data: {e}")
-        sys.exit(1)
-
-def fetch_checksum_file(release_data):
-    """
-    Fetch the checksum.txt file from the release assets
-    and parse it into a dictionary mapping file names to their SHA256 checksums.
-    """
-    checksums = {}
-
-    # Find the checksum.txt asset URL
-    checksum_asset = None
-    for asset in release_data['assets']:
-        if asset['name'] == 'checksums.txt':
-            checksum_asset = asset
-            break
-
-    if not checksum_asset:
-        print("Warning: checksum.txt file not found in release assets.")
-        return checksums
-
-    # Download the checksum file
-    headers = {
-        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
-        'Accept': 'application/octet-stream'
-    }
-
-    try:
-        response = requests.get(checksum_asset['browser_download_url'], headers=headers)
-        response.raise_for_status()
-
-        # Parse checksum file
-        for line in response.text.splitlines():
-            if line.strip():
-                checksum, filename = line.strip().split(None, 1)
-                checksums[filename] = checksum
-
-        return checksums
-    except requests.RequestException as e:
-        print(f"Error fetching checksum file: {e}")
-        return checksums
-    except Exception as e:
-        print(f"Error parsing checksum file: {e}")
-        return checksums
-
-def extract_build_hash(target_commitish):
-    """Extract the first 8 characters of the commit hash."""
-    return f"commit.{target_commitish[:8]}"
-
-def generate_asset_json(release_data, asset, checksums):
-    """Generate JSON for a specific asset."""
-    version = release_data['tag_name'].lstrip('v')
-    build = extract_build_hash(release_data['target_commitish'])
-    long_version = f"{version}+{build}"
-
-    # Get SHA256 checksum if available
-    sha256 = checksums.get(asset['name'], "")
-
-    return {
-        "name": asset['name'],
-        "version": version,
-        "build": build,
-        "longVersion": long_version,
-        "url": asset['browser_download_url'],
-        "sha256": sha256,
-        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION", ""),
-        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION", "")
-    }
-
-def save_platform_json(platform_folder, asset_json, tag):
-    """Save asset JSON and update list.json for a specific platform."""
-    # Create platform folder if it doesn't exist
-    os.makedirs(platform_folder, exist_ok=True)
-
-    # Update or create list.json
-    list_file_path = os.path.join(platform_folder, "list.json")
-
-    if os.path.exists(list_file_path):
-        with open(list_file_path, 'r') as f:
-            try:
-                list_data = json.load(f)
-            except json.JSONDecodeError:
-                list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-    else:
-        list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-
-    # Remove any existing entry with the same path
-    list_data['builds'] = [
-        build for build in list_data['builds']
-        if build['version'] != asset_json['version']
-    ]
-    # Add the new build
-    list_data['builds'].append(asset_json)
-
-    # Update releases
-    version = asset_json['version']
-    list_data['releases'][version] = f"{asset_json['name']}+{asset_json['longVersion']}"
-
-    # Update latest release
-    list_data['latestRelease'] = version
-
-    with open(list_file_path, 'w') as f:
-        json.dump(list_data, f, indent=4)
-
-def main():
-    # Validate arguments
-    if len(sys.argv) != 3:
-        print("Usage: python script.py <repo> <tag>")
-        sys.exit(1)
-
-    repo, tag = sys.argv[1], sys.argv[2]
-
-    # Validate GitHub token
-    validate_github_token()
-
-    # Fetch release data
-    release_data = fetch_release_data(repo, tag)
-
-    # Fetch checksums
-    checksums = fetch_checksum_file(release_data)
-
-    # Mapping of asset names to platform folders
-    platform_mapping = {
-        'resolc-x86_64-unknown-linux-musl': 'linux',
-        'resolc-universal-apple-darwin': 'macos',
-        'resolc-x86_64-pc-windows-msvc.exe': 'windows',
-        'resolc_web.js': 'wasm'
-    }
-
-    # Process each asset
-    for asset in release_data['assets']:
-        platform_name = platform_mapping.get(asset['name'])
-        if platform_name:
-            platform_folder = os.path.join(platform_name)
-            asset_json = generate_asset_json(release_data, asset, checksums)
-            save_platform_json(platform_folder, asset_json, tag)
-            print(f"Processed {asset['name']} for {platform_name}")
-
-if __name__ == "__main__":
-    main()

.github/workflows/build-revive-wasm.yml

@@ -0,0 +1,143 @@
+name: Build revive-wasm
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+  REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
+  BUN_VERSION: 1.1.43
+
+jobs:
+  build-revive-wasm:
+    runs-on: parity-large
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Cache LLVM build
+        id: cache-llvm
+        uses: actions/cache@v3
+        with:
+          path: |
+            target-llvm/emscripten/target-final
+            target-llvm/gnu/target-final
+          # Use a unique key based on LLVM version or configuration files to avoid cache invalidation
+          key: llvm-build-${{ runner.os }}-${{ hashFiles('LLVM.lock', 'Cargo.toml', 'Cargo.lock', 'crates/llvm-builder/**', '.github/workflows/build-revive-wasm.yml') }}
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld
+
+      - name: Install Rust stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          components: rust-src
+          target: wasm32-unknown-emscripten
+
+      - name: Install LLVM build dependencies
+        run: |
+          make install-llvm-builder
+          revive-llvm --target-env emscripten clone
+
+      - name: Setup revive environment variables
+        run: |
+          echo "LLVM_SYS_181_PREFIX=$(pwd)/target-llvm/gnu/target-final" >> $GITHUB_ENV
+          echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/target-llvm/emscripten/target-final" >> $GITHUB_ENV
+
+      - name: Build host LLVM
+        if: steps.cache-llvm.outputs.cache-hit != 'true'
+        run: |
+          revive-llvm build --llvm-projects lld --llvm-projects clang
+
+      - name: Build target LLVM
+        if: steps.cache-llvm.outputs.cache-hit != 'true'
+        run: |
+          source emsdk/emsdk_env.sh
+          revive-llvm --target-env emscripten build --llvm-projects lld
+
+      - run: |
+          rustup show
+          cargo --version
+          rustup +nightly show
+          cargo +nightly --version
+          cmake --version
+          bash --version
+
+      - name: Use Cached LLVM
+        if: steps.cache-llvm.outputs.cache-hit == 'true'
+        run: |
+          echo "Using cached LLVM"
+
+      - name: Build revive
+        run: |
+          source emsdk/emsdk_env.sh
+          make install-wasm
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: revive-wasm
+          path: |
+            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.js
+            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.wasm
+            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc_packed.js
+          retention-days: 1
+
+  test-revive-wasm:
+    needs: build-revive-wasm
+    strategy:
+      matrix:
+        os: ["ubuntu-24.04", "macos-14", "windows-2022"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create Target Directory
+        run: mkdir -p ${{ env.REVIVE_WASM_INSTALL_DIR }}
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: revive-wasm
+          path: ${{ env.REVIVE_WASM_INSTALL_DIR }}
+
+      - name: Set Up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+
+      - name: Install Bun on Windows
+        if: runner.os == 'Windows'
+        run: |
+          Set-ExecutionPolicy RemoteSigned -Scope CurrentUser
+          iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
+          scoop install bun@${{ env.BUN_VERSION }}
+          scoop install wget
+          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
+
+      - name: Install Bun on macOS and Linux
+        if: runner.os != 'Windows'
+        run: |
+          curl -fsSL https://bun.sh/install | bash -s bun-v${{ env.BUN_VERSION }}
+          echo "$HOME/.bun/bin" >> $GITHUB_PATH
+
+      - name: Install packages
+        run: npm install
+
+      - name: Run Playwright tests
+        run: |
+          cd js
+          npx playwright install --with-deps
+          npx playwright test
+
+      - name: Test revive
+        run: |
+          echo "Running tests for ${{ matrix.os }}"
+          npm run test:wasm

.github/workflows/generate_versions.yml

@@ -1,64 +0,0 @@
-name: Generate JSON for resolc-bin
-on:
-  release:
-    types: [published]
-
-jobs:
-  generateJson:
-    runs-on: ubuntu-latest
-    if: contains(github.event.release.tag_name, 'llvm') == false
-    environment: tags
-    env:
-      # the token is needed for json_generator.py
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: tmp
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          repository: paritytech/resolc-bin
-          path: resolc-bin
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.REVIVE_JSON_APP_ID }}
-          private-key: ${{ secrets.REVIVE_JSON_APP_KEY }}
-          owner: paritytech
-          repositories: resolc-bin
-
-      - name: Generate json and push
-        env:
-          TOKEN: ${{ steps.app-token.outputs.token }}
-          APP_NAME: "paritytech-revive-json"
-          Green: "\e[32m"
-          NC: "\e[0m"
-        run: |
-          sudo apt-get update && sudo apt-get install -y wget
-          wget https://github.com/${GITHUB_REPOSITORY}/releases/download/${GITHUB_REF_NAME}/resolc-x86_64-unknown-linux-musl
-          chmod +x resolc-x86_64-unknown-linux-musl
-          export FIRST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
-          export LAST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
-
-          cd resolc-bin
-          python ../tmp/.github/scripts/json_generator.py ${GITHUB_REPOSITORY} ${{ github.event.release.tag_name }}
-
-          echo "${Green}Add new remote with gh app token${NC}"
-          git remote set-url origin $(git config remote.origin.url | sed "s/github.com/${APP_NAME}:${TOKEN}@github.com/g")
-
-          echo "${Green}Remove http section that causes issues with gh app auth token${NC}"
-          sed -i.bak '/\[http/d' ./.git/config
-          sed -i.bak '/extraheader/d' ./.git/config
-
-          git config user.email "ci@parity.io"
-          git config user.name "${APP_NAME}"
-
-          git add .
-          git commit -m "Update json"
-          git push origin main
-
-          echo "::notice::info.list files were successfully published to https://github.com/paritytech/resolc-bin"

.github/workflows/release-llvm.yml

@@ -1,132 +0,0 @@
-name: Release LLVM
-on:
-  workflow_dispatch:
-    inputs:
-      llvm_version:
-        type: string
-        required: true
-        description: llvm version in "x.x.x" format, e.g. "18.1.8"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  create-release-draft:
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    outputs:
-      version: ${{ steps.resolve-version.outputs.version }}
-    steps:
-      - id: resolve-version
-        run: |
-          echo "version=llvm-${{ inputs.llvm_version }}-revive.${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          name: ${{ steps.resolve-version.outputs.version }}
-          body: "LLVM is a dependency of revive. The LLVM releases are used by our CI to build revive."
-          draft: true
-          tag_name: ${{ steps.resolve-version.outputs.version }}
-
-  build:
-    strategy:
-      matrix:
-        target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-emscripten, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
-        include:
-          - target: x86_64-unknown-linux-gnu
-            builder-arg: gnu
-            host: linux
-            runner: parity-large
-          - target: x86_64-unknown-linux-musl
-            builder-arg: musl
-            host: linux
-            runner: parity-large
-          - target: wasm32-unknown-emscripten
-            builder-arg: emscripten
-            host: linux
-            runner: parity-large
-          - target: aarch64-apple-darwin
-            builder-arg: gnu
-            host: macos
-            runner: macos-14
-          - target: x86_64-apple-darwin
-            builder-arg: gnu
-            host: macos
-            runner: macos-13
-          - target: x86_64-pc-windows-msvc
-            builder-arg: gnu
-            host: windows
-            runner: windows-2022
-    needs: create-release-draft
-    runs-on: ${{ matrix.runner }}
-    env:
-      RUST_LOG: trace
-    permissions:
-      contents: write # for uploading assets to release
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-          cache-key: ${{ matrix.target }}
-
-      - name: Install Dependencies
-        if: ${{ matrix.host == 'linux' }}
-        run: |
-          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
-
-      - name: Install Dependencies
-        if: ${{ matrix.host == 'macos' }}
-        run: |
-          brew install ninja
-
-      - name: Install LLVM Builder
-        run: |
-          cargo install --path crates/llvm-builder
-
-      - name: Clone LLVM
-        run: |
-          revive-llvm --target-env ${{ matrix.builder-arg }} clone
-
-      - name: Build LLVM
-        if: ${{ matrix.target != 'wasm32-unknown-emscripten' }}
-        run: |
-          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld --llvm-projects clang
-
-      - name: Build LLVM
-        if: ${{ matrix.target == 'wasm32-unknown-emscripten' }}
-        run: |
-          source emsdk/emsdk_env.sh
-          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld
-
-      - name: Remove Unnecessary Binaries
-        shell: bash
-        run: |
-          cd target-llvm/${{ matrix.builder-arg }}/target-final/bin/
-          rm -f diagtool* llvm-libtool-darwin* llvm-lipo* llvm-pdbutil* llvm-dwarfdump* llvm-nm* llvm-readobj* llvm-cfi-verify* \
-              sancov* llvm-debuginfo-analyzer* llvm-objdump* llvm-profgen* llvm-extract* llvm-jitlink* llvm-c-test* llvm-gsymutil* llvm-dwp* \
-              dsymutil* llvm-dwarfutil* llvm-exegesis* lli clang-rename* bugpoint* clang-extdef-mapping* clang-refactor* c-index-test* \
-              llvm-reduce* llvm-lto* clang-linker-wrapper* llc* llvm-lto2* llvm-otool* llvm-readelf* \
-              clang-repl* clang-check* clang-scan-deps*
-          cd -
-
-      - name: Package Artifact
-        shell: bash
-        run: |
-          mv target-llvm/${{ matrix.builder-arg }}/target-final/ llvm-${{ matrix.target }}
-          tar -czf "${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz" llvm-${{ matrix.target }}
-
-      - name: Add Artifact to Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ needs.create-release-draft.outputs.version }}
-          draft: true
-          files: |
-            ${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz

.github/workflows/release.yml

@@ -1,288 +0,0 @@
-name: Build & Release
-on:
-  push:
-    branches: ["main"]
-    tags:
-      - "v*"
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize, labeled, unlabeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
-
-jobs:
-  check-version-changed:
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    env:
-      CURRENT_TAG: ${{ github.ref_name }}
-    outputs:
-      RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
-    steps:
-      - uses: actions/checkout@v4
-
-      # Check that tag and version in Cargo.toml match
-      - name: Check versions
-        id: versions
-        run: |
-          if [[ $CURRENT_TAG == 'main' ]];
-            then
-              echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in the main branch";
-              exit 0
-            fi
-
-          if [[ $CURRENT_TAG != "v"* ]];
-            then
-              echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in a PR";
-              exit 0
-            fi
-
-          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
-          echo "Current tag $CURRENT_TAG"
-          echo "Package version $PKG_VER"
-          #
-          if [[ $CURRENT_TAG != $PKG_VER  ]];
-            then
-              echo "::error::Tag $CURRENT_TAG doesn't match package version $PKG_VER in Cargo.toml, please fix";
-              exit 1
-            fi
-
-          # Generating release notes early, in order to avoid checkout at the last step
-          export RELEASE_NOTES="$(sed '/^## '${CURRENT_TAG}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"
-
-          echo "Release notes:"
-          echo "$RELEASE_NOTES"
-
-          echo 'RELEASE_NOTES<<EOF' >> $GITHUB_OUTPUT
-          echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
-          echo 'EOF' >> $GITHUB_OUTPUT
-
-  build:
-    strategy:
-      matrix:
-        target:
-          [
-            x86_64-unknown-linux-musl,
-            aarch64-apple-darwin,
-            x86_64-apple-darwin,
-            x86_64-pc-windows-msvc,
-          ]
-        include:
-          - target: x86_64-unknown-linux-musl
-            type: musl
-            runner: ubuntu-24.04
-          - target: aarch64-apple-darwin
-            type: native
-            runner: macos-14
-          - target: x86_64-apple-darwin
-            type: native
-            runner: macos-13
-          - target: x86_64-pc-windows-msvc
-            type: native
-            runner: windows-2022
-    runs-on: ${{ matrix.runner }}
-    needs: [check-version-changed]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-          cache-key: ${{ matrix.target }}
-
-      - name: Download LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: ${{ matrix.target }}
-
-      - name: Build
-        if: ${{ matrix.type == 'native' }}
-        shell: bash
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-${{ matrix.target }}
-          make install-bin
-          mv target/release/resolc resolc-${{ matrix.target }} || mv target/release/resolc.exe resolc-${{ matrix.target }}.exe
-
-      - name: Build
-        if: ${{ matrix.type == 'musl' }}
-        run: |
-          docker run -v $PWD:/opt/revive $RUST_MUSL_CROSS_IMAGE /bin/bash -c "
-           cd /opt/revive
-           chown -R root:root .
-           apt update && apt upgrade -y && apt install -y pkg-config
-           export LLVM_SYS_181_PREFIX=/opt/revive/llvm-${{ matrix.target }}
-           make install-bin
-           mv target/${{ matrix.target }}/release/resolc resolc-${{ matrix.target }}
-           "
-          sudo chown -R $(id -u):$(id -g) .
-
-      - name: Install Solc
-        uses: ./.github/actions/get-solc
-
-      - name: Basic Sanity Check
-        shell: bash
-        run: |
-          result=$(./resolc-${{ matrix.target }} --bin crates/integration/contracts/flipper.sol)
-          echo $result
-          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: resolc-${{ matrix.target }}
-          path: resolc-${{ matrix.target }}*
-          retention-days: 1
-
-  build-wasm:
-    runs-on: ubuntu-24.04
-    needs: [check-version-changed]
-    env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive-workflow-test/releases/download/${{ github.ref_name }}/resolc.wasm
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          target: wasm32-unknown-emscripten
-          # without this it will override our rust flags
-          rustflags: ""
-
-      - name: Download Host LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: x86_64-unknown-linux-gnu
-
-      - name: Download Wasm LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: wasm32-unknown-emscripten
-
-      - name: Download EMSDK
-        uses: ./.github/actions/get-emsdk
-
-      - name: Build
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-x86_64-unknown-linux-gnu
-          export REVIVE_LLVM_TARGET_PREFIX=$PWD/llvm-wasm32-unknown-emscripten
-          source emsdk/emsdk_env.sh
-          make install-wasm
-          chmod -x ./target/wasm32-unknown-emscripten/release/resolc.wasm
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - name: Basic Sanity Check
-        run: |
-          mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.29/soljson.js
-          node -e "
-          const soljson = require('solc/soljson');
-          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
-
-          const compiler = createRevive();
-          compiler.soljson = soljson;
-
-          const standardJsonInput =
-          {
-            language: 'Solidity',
-            sources: {
-              'MyContract.sol': {
-                content: 'pragma solidity ^0.8.0; contract MyContract { function greet() public pure returns (string memory) { return \'Hello\'; } }',
-              },
-            },
-            settings: { optimizer: { enabled: false } }
-          };
-
-          compiler.writeToStdin(JSON.stringify(standardJsonInput));
-          compiler.callMain(['--standard-json']);
-
-          // Collect output
-          const stdout = compiler.readFromStdout();
-          const stderr = compiler.readFromStderr();
-
-          if (stderr) { console.error(stderr); process.exit(1); }
-
-          let out = JSON.parse(stdout);
-          let bytecode = out.contracts['MyContract.sol']['MyContract'].evm.bytecode.object
-          console.log(bytecode);
-
-          if(!bytecode.startsWith('50564d')) { process.exit(1); }
-          "
-
-      - name: Compress Artifact
-        run: |
-          mkdir -p resolc-wasm32-unknown-emscripten
-          mv ./target/wasm32-unknown-emscripten/release/resolc.js ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc.wasm ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc_web.js ./resolc-wasm32-unknown-emscripten/
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: resolc-wasm32-unknown-emscripten
-          path: resolc-wasm32-unknown-emscripten/*
-          retention-days: 1
-
-  create-release:
-    if: startsWith(github.ref_name, 'v')
-    needs: [check-version-changed, build-wasm]
-    runs-on: macos-14
-    environment: tags
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Create macOS Fat Binary
-        run: |
-          lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
-
-      - name: Make Executable
-        run: |
-          chmod +x resolc-x86_64-unknown-linux-musl
-          chmod +x resolc-universal-apple-darwin
-
-      - name: Create sha-256 checksum
-        run: |
-          shasum -a 256 resolc-x86_64-unknown-linux-musl > checksums.txt
-          shasum -a 256 resolc-universal-apple-darwin >> checksums.txt
-          shasum -a 256 resolc-x86_64-pc-windows-msvc.exe >> checksums.txt
-          shasum -a 256 resolc.js >> checksums.txt
-          shasum -a 256 resolc.wasm >> checksums.txt
-          shasum -a 256 resolc_web.js >> checksums.txt
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.REVIVE_RELEASE_APP_ID }}
-          private-key: ${{ secrets.REVIVE_RELEASE_APP_KEY }}
-
-      - name: create-release
-        uses: softprops/action-gh-release@v2
-        with:
-          body: |
-            ## Changelog
-            ${{ needs.check-version-changed.outputs.RELEASE_NOTES }}
-
-            ## Note for macOS Users
-            The macOS binary is unsigned and it needs to be made runnable using `xattr -c resolc-universal-apple-darwin`.
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          prerelease: true
-          token: ${{ steps.app-token.outputs.token }}
-          target_commitish: ${{ github.sha }}
-          files: |
-            resolc-x86_64-unknown-linux-musl
-            resolc-universal-apple-darwin
-            resolc-x86_64-pc-windows-msvc.exe
-            resolc.js
-            resolc.wasm
-            resolc_web.js
-            checksums.txt

.github/workflows/rust.yml

@@ -0,0 +1,58 @@
+name: Build
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build-ubuntu-x86:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install solc
+        run: |
+          mkdir -p solc
+          curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux
+          chmod +x solc/solc
+          echo "$(pwd)/solc/" >> $GITHUB_PATH
+
+      - name: Install LLVM
+        run: |
+          curl -sSL --output llvm.tar.xz https://github.com/paritytech/revive/releases/download/v0.1.0-dev.7/clang+llvm-18.1.8-x86_64-linux-gnu-ubuntu-24.04.tar.xz
+          mkdir llvm18
+          tar Jxf llvm.tar.xz -C llvm18/
+          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm18" >> $GITHUB_ENV
+
+      - name: Install apt dependencies
+        run: |
+          sudo add-apt-repository -y ppa:ethereum/ethereum
+          sudo apt update
+          sudo apt install -y ethereum
+
+      - name: Machete
+        uses: bnjbvr/cargo-machete@main
+
+      - name: Format
+        run: make format
+
+      - name: Clippy
+        run: make clippy
+
+      - name: Test cargo workspace
+        run: make test-workspace
+
+      - name: Test CLI
+        run: make test-cli
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ github.job }}-resolc
+          path: ./target/release/resolc
+          retention-days: 1

.github/workflows/test-llvm-builder.yml

@@ -1,45 +0,0 @@
-name: Test LLVM Builder
-on:
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize]
-    paths:
-      - 'LLVM.lock'
-      - 'crates/llvm-builder/**'
-      - '.github/workflows/test-llvm-builder.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        runner: [parity-large, macos-14, windows-2022]
-    runs-on: ${{ matrix.runner }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-          cache-key: ${{ matrix.runner }}
-
-      - name: Install Dependencies
-        if: matrix.runner == 'parity-large'
-        run: |
-          sudo apt update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
-
-      - name: Install Dependencies
-        if: matrix.runner == 'macos-14'
-        run: |
-          brew install ninja
-
-      - name: Test
-        run: make test-llvm-builder
-        env:
-          RUST_LOG: trace

.github/workflows/test-wasm.yml

@@ -1,98 +0,0 @@
-name: Test Wasm Version
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
-
-jobs:
-  build:
-    runs-on: ubuntu-24.04
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          target: wasm32-unknown-emscripten
-          # without this it will override our rust flags
-          rustflags: ""
-
-      - name: Download Host LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: x86_64-unknown-linux-gnu
-
-      - name: Download Wasm LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: wasm32-unknown-emscripten
-
-      - name: Install emsdk
-        uses: ./.github/actions/get-emsdk
-
-      - name: Set LLVM Environment Variables
-        run: |
-          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
-          echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/llvm-wasm32-unknown-emscripten" >> $GITHUB_ENV
-
-      - name: Build Revive
-        run: |
-          source emsdk/emsdk_env.sh
-          make install-wasm
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: revive-wasm
-          path: |
-            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.js
-            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.wasm
-            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc_web.js
-          retention-days: 1
-
-  test:
-    needs: build
-    strategy:
-      matrix:
-        os: ["ubuntu-24.04", "macos-14", "windows-2022"]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Target Directory
-        run: mkdir -p ${{ env.REVIVE_WASM_INSTALL_DIR }}
-
-      - name: Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: revive-wasm
-          path: ${{ env.REVIVE_WASM_INSTALL_DIR }}
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - name: Install Node Packages
-        run: npm install
-
-      - name: Run Playwright tests
-        run: |
-          cd js
-          npx playwright install --with-deps
-          npx playwright test
-
-      - name: Test revive
-        run: |
-          echo "Running tests for ${{ matrix.os }}"
-          npm run test:wasm

.github/workflows/test.yml

@@ -1,57 +0,0 @@
-name: Test
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  test:
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-
-      - name: Install Solc
-        uses: ./.github/actions/get-solc
-
-      - name: Download LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: x86_64-unknown-linux-gnu
-
-      - name: Set LLVM Environment Variables
-        run: |
-          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
-
-      - name: Install Geth
-        run: |
-          sudo add-apt-repository -y ppa:ethereum/ethereum
-          sudo apt update
-          sudo apt install -y ethereum
-
-      - name: Machete
-        uses: bnjbvr/cargo-machete@v0.7.1
-
-      - name: Format
-        run: make format
-
-      - name: Clippy
-        run: make clippy
-
-      - name: Test cargo workspace
-        run: make test-workspace
-
-      - name: Test CLI
-        run: make test-cli

CHANGELOG.md

@@ -2,94 +2,6 @@
 
 ## Unreleased
 
-This is a development pre-release.
-
-## v0.1.0-dev.13
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-- Support for solc v0.8.29
-- Decouples the solc JSON-input-output type definitions from the Solidity fronted and expose them via a dedicated crate.
-- `--supported-solc-versions` for `resolc` binary to return a `semver` range of supported `solc` versions.
-- Support for passing LLVM command line options via the prcoess input or providing one or more `--llvm-arg='..'` resolc CLI flag. This allows more fine-grained control over the LLVM backend configuration.
-
-### Changed
-- Storage keys and values are big endian. This was a pre-mature optimization because for the contract itself it this is a no-op and thus not observable. However we should consider the storage layout as part of the contract ABI. The endianness of transient storage values are still kept as-is.
-- Running `resolc` using webkit is no longer supported.
-
-### Fixed
-- A missing byte swap for the create2 salt value.
-
-## v0.1.0-dev.12
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`
-
-### Added
-- Per file output selection for `--standard-json` mode.
-- The `ir` output selection option for `--standard-json` mode.
-
-### Changed
-- Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).
-
-### Fixed
-
-## v0.1.0-dev.11
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
-
-### Added
-
-### Changed
-
-### Fixed
-- A bug causing incorrect loads from the emulated EVM linear memory.
-- A missing integer truncate after switching to 64bit.
-
-## v0.1.0-dev.10
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
-
-### Added
-- Support for the `coinbase` opcode.
-- The resolc web JS version.
-
-### Changed
-- Missing the `--overwrite` flag emits an error instead of a warning.
-- The `resolc` executable prints the help by default.
-- Removed support for legacy EVM assembly (EVMLA) translation.
-- integration: identify cached code blobs on source code to fix potential confusions.
-- Setting base, include or allow paths in emscripten is now a hard error.
-- Employ a heuristic to detect `address.transfer` and `address.send` calls.
-  If detected, the re-entrant call flag is not set and 0 deposit limit is endowed.
-
-### Fixed
-- Solidity: Add the solc `--libraries` files to sources.
-- A data race in tests.
-- Fix `broken pipe` errors.
-- llvm-builder: Allow warnings.
-- solidity: Fix the custom compiler warning messages.
-
-## v0.1.0-dev.9
-
-This is a development pre-release.
-
-### Added
-
-### Changed
-- Syscalls with more than 6 arguments now pack them into registers.
-
-### Fixed
-- Remove reloading of the resolc.js file (fix issue with relative path in web worker)
-
 ## v0.1.0-dev.8
 
 This is a development pre-release.
@@ -124,9 +36,9 @@ This is a development pre-release.
 - Calls forward maximum weight limits instead of 0, anticipating a change in polkadot-sdk where weight limits of 0 no longer interprets as uncapped limit.
 
 ### Fixed
-- A linker bug which was preventing certain contracts from linking with the PVM linker.
+- A linker bug which was preventing certain contracts from linking with the PVM linker. 
 - JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
-- The git commit hash slug is always displayed in the version string.
+- The git commit hash slug is always displayed in the version string. 
 
 ## v0.1.0-dev.6
 

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.8"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -14,48 +14,48 @@ repository = "https://github.com/paritytech/revive"
 rust-version = "1.81.0"
 
 [workspace.dependencies]
-revive-benchmarks = { version = "0.1.0-dev.13", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.13", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.13", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.13", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.13", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.13", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.13", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.13", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.13", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.13", path = "crates/runner" }
-revive-solc-json-interface = { version = "0.1.0-dev.13", path = "crates/solc-json-interface" }
-revive-solidity = { version = "0.1.0-dev.13", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.13", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.13", path = "crates/build-utils" }
+revive-benchmarks = { version = "0.1.0-dev.8", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.8", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.8", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.8", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.8", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.8", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.8", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.8", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.8", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.8", path = "crates/runner" }
+revive-solidity = { version = "0.1.0-dev.8", path = "crates/solidity" }
+revive-stdlib = { version = "0.1.0-dev.8", path = "crates/stdlib" }
+revive-build-utils = { version = "0.1.0-dev.8", path = "crates/build-utils" }
 
 hex = "0.4.3"
-cc = "1.2"
+cc = "1.0"
 libc = "0.2.169"
-tempfile = "3.17"
+tempfile = "3.8"
 anyhow = "1.0"
-semver = { version = "1.0", features = ["serde"] }
+semver = { version = "1.0", features = [ "serde" ] }
 itertools = "0.14"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = { version = "1.0", features = ["arbitrary_precision"] }
+serde = { version = "1.0", features = [ "derive" ] }
+serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }
 regex = "1.10"
-once_cell = "1.20"
+once_cell = "1.19"
 num = "0.4.3"
 sha1 = "0.10"
 sha3 = "0.10"
+md5 = "0.7.0"
 thiserror = "2.0"
 which = "7.0"
 path-slash = "0.2"
 rayon = "1.8"
 clap = { version = "4", default-features = false, features = ["derive"] }
-polkavm-common = "0.21.0"
-polkavm-linker = "0.21.0"
-polkavm-disassembler = "0.21.0"
-polkavm = "0.21.0"
-alloy-primitives = { version = "0.8.21", features = ["serde"] }
-alloy-sol-types = "0.8.21"
-alloy-genesis = "0.11.1"
-alloy-serde = "0.11.1"
+polkavm-common = "0.19.0"
+polkavm-linker = "0.19.0"
+polkavm-disassembler = "0.19.0"
+polkavm = "0.19.0"
+alloy-primitives = { version = "0.8.19", features = ["serde"] }
+alloy-sol-types = "0.8.19"
+alloy-genesis = "0.9.2"
+alloy-serde = "0.9.2"
 env_logger = { version = "0.11.6", default-features = false }
 serde_stacker = "0.1.11"
 criterion = { version = "0.5.1", features = ["html_reports"] }
@@ -65,15 +65,15 @@ downloader = "0.2.8"
 flate2 = "1.0.35"
 fs_extra = "1.3.0"
 num_cpus = "1"
-tar = "0.4"
-toml = "0.8"
-assert_cmd = "2.0"
-assert_fs = "1.1"
+tar = "0.4.43"
+toml = "0.8.19"
+assert_cmd = "2.0.16"
+assert_fs = "1.1.2"
 
 # polkadot-sdk and friends
 codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 scale-info = { version = "2.11.6", default-features = false }
-polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c29e72a8628835e34deb6aa7db9a78a2e4eabcee" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "d62a90c8c729acd98c7e9a5cab9803b8b211ffc5" }
 
 # llvm
 [workspace.dependencies.inkwell]

Dockerfile

@@ -11,7 +11,7 @@ RUN make install-llvm-builder
 RUN revive-llvm --target-env musl clone
 RUN revive-llvm --target-env musl build  --llvm-projects lld --llvm-projects clang
 
-FROM messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561 AS resolc-builder
+FROM messense/rust-musl-cross:x86_64-musl AS resolc-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 

Makefile

@@ -23,7 +23,7 @@
 install: install-bin install-npm
 
 install-bin:
-	cargo install --locked --path crates/solidity
+	cargo install --path crates/solidity
 
 install-npm:
 	npm install && npm fund
@@ -43,7 +43,7 @@ format:
 	cargo fmt --all --check
 
 clippy:
-	cargo clippy --all-features --workspace --tests --benches -- --deny warnings
+	cargo clippy --all-features --workspace --tests --benches -- --deny warnings --allow dead_code
 
 machete:
 	cargo install cargo-machete

README.md

@@ -1,9 +1,9 @@
-![CI](https://github.com/paritytech/revive/actions/workflows/test.yml/badge.svg)
-[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io/revive_compiler/)
+![CI](https://github.com/paritytech/revive/actions/workflows/rust.yml/badge.svg)
+[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io)
 
 # revive
 
-YUL recompiler to LLVM, targetting RISC-V on [PolkaVM](https://github.com/koute/polkavm).
+YUL and EVM assembly recompiler to LLVM, targetting RISC-V on [PolkaVM](https://github.com/koute/polkavm).
 
 Visit [contracts.polkadot.io](https://contracts.polkadot.io) to learn more about contracts on Polkadot!
 
@@ -14,7 +14,10 @@ This is experimental software in active development and not ready just yet for p
 Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).
 
 ## Installation
-Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.
+
+`resolc` depends on the [solc](https://github.com/ethereum/solidity) binary installed on your system.
+
+Download and install the `resolc` frontend executable for your platform from our [releases](https://github.com/paritytech/revive/releases).
 
 ## Building from source
 
@@ -22,46 +25,22 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 
 ### LLVM
 
-`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. You can either download a build from our releases (recommended for older hardware) or build it from source.
-
-<details>
-  <summary>Download from our LLVM releases</summary>
-
-Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.
-
-> **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
-> ```sh
-> xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
-> ```
-
-After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
-```sh
-export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
-```
-
-</details>
-
-<details>
-  <summary>Building from source</summary>
-
- Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
+`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
 
 The `Makefile` provides a shortcut target to obtain a compatible LLVM build:
 
-```sh
+```bash
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
 ```
 
-</details>
-
 ### The `resolc` Solidity frontend
 
-To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
+To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build using [revive-llvm](crates/llvm-builder/README.md) and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
 
 To install the `resolc` Solidity frontend executable:
 
-```sh
+```bash
 make install-bin
 resolc --version
 ```
@@ -70,10 +49,7 @@ resolc --version
 
 Cross-compile the `resolc.js` frontend executable to Wasm for running it in a Node.js or browser environment. The `REVIVE_LLVM_TARGET_PREFIX` environment variable is used to control the target environment LLVM dependency.
 
-<details>
-  <summary>Instructions for cross-compilation to wasm32-unknown-emscripten</summary>
-
-```sh
+```bash
 # Build the host LLVM dependency with PolkaVM target support
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
@@ -89,23 +65,21 @@ make install-wasm
 make test-wasm
 ```
 
-</details>
-
-## Development
+### Development
 
 Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks. 
 Ensure that your branch passes `make test` locally when submitting a pull request.
 
-### Design overview
-See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 
+## Design overview
 
-[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc` (the project started as a fork of the era compiler).
+`revive` uses [solc](https://github.com/ethereum/solidity/), the Ethereum Solidity compiler, as the [Solidity frontend](crates/solidity/src/lib.rs) to process smart contracts written in Solidity. The YUL IR code (or legacy EVM assembly as a fallback for older `solc` versions) emitted by `solc` is then translated to LLVM IR, targetting [Polkadots `revive` pallet](https://docs.rs/pallet-revive/latest/pallet_revive/trait.SyscallDoc.html).
+[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc`.
 
-### Tests
+## Tests
 
 Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
 Once Geth is installed, you can run the tests using the following command:
 
-```sh
+```bash
 make test
 ```

RELEASE.md

@@ -4,18 +4,8 @@ Prior to the first stable release we neither have formal release processes nor d
 
 To create a new pre-release:
 
-1. Create a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly.
-2. If the CI passes, merge the release PR.
-3. Push a tag that has the same `-dev.X` version as in `Cargo.toml`
-4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
-5. Wait for the `Release` workflow to finish. It should create the pre-release with the same `-dev.X` name.
-6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
-7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
-8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
-
-# LLVM release
-
-To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.
-Version suffix will be resolved automatically.  
-The workflows will create new GitHub release, and upload LLVM binaries.
-Next release of resolc will use newly created binaries.  
+1. Merge a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly
+2. Push a release tag to `main`
+3. Create a __pre-release__ from the tag and manually upload the `resolc` binary from docker image
+4. Manually upload `resolc.js` and `resolc.wasm` from the `build-revive-wasm` action artifacts.
+5. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly

crates/common/src/extension.rs

@@ -12,6 +12,12 @@ pub static EXTENSION_ABI: &str = "abi";
 /// The Yul IR file extension.
 pub static EXTENSION_YUL: &str = "yul";
 
+/// The EVM legacy assembly IR file extension.
+pub static EXTENSION_EVMLA: &str = "evmla";
+
+/// The Ethereal IR file extension.
+pub static EXTENSION_ETHIR: &str = "ethir";
+
 /// The EVM file extension.
 pub static EXTENSION_EVM: &str = "evm";
 

crates/differential/genesis.json

@@ -16,16 +16,9 @@
         "shanghaiTime": 0,
         "cancunTime": 0,
         "terminalTotalDifficulty": 0,
-        "terminalTotalDifficultyPassed": true,
-        "blobSchedule": {
-            "cancun": {
-                "target": 3,
-                "max": 6,
-                "baseFeeUpdateFraction": 3338477
-            }
-        }
+        "terminalTotalDifficultyPassed": true
     },
-    "coinbase": "0xffffffffffffffffffffffffffffffffffffffff",
+    "coinbase": "0x0000000000000000000000000000000000000000",
     "difficulty": "0x20000",
     "extraData": "",
     "gasLimit": "0xffffffff",

crates/differential/src/lib.rs

@@ -413,7 +413,7 @@ impl Evm {
         let stderr = str::from_utf8(output.stderr.as_slice())
             .unwrap_or_else(|err| panic!("{EXECUTABLE_NAME} stderr failed to parse: {err}"));
 
-        let mut log: EvmLog = format!("{stdout}{stderr}").as_str().into();
+        let mut log: EvmLog = stdout.into();
         log.stderr = stderr.into();
         if self.bench {
             log.parse_gas_used_from_bench();

crates/integration/Cargo.toml

@@ -15,7 +15,6 @@ serde_json = { workspace = true }
 
 revive-solidity = { workspace = true }
 revive-runner = { workspace = true }
-revive-llvm-context = { workspace = true }
 
 [dev-dependencies]
 sha1 = { workspace = true }

crates/integration/codesize.json

@@ -1,10 +1,10 @@
 {
-  "Baseline": 1443,
-  "Computation": 2788,
-  "DivisionArithmetics": 9748,
-  "ERC20": 19150,
-  "Events": 2201,
-  "FibonacciIterative": 2041,
-  "Flipper": 2691,
-  "SHA1": 8997
+  "Baseline": 1110,
+  "Computation": 2389,
+  "DivisionArithmetics": 14822,
+  "ERC20": 23973,
+  "Events": 1605,
+  "FibonacciIterative": 2023,
+  "Flipper": 1989,
+  "SHA1": 17026
 }

crates/integration/contracts/AddressPredictor.sol

@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.28;
-
-contract Predicted {
-    uint public salt;
-
-    constructor(uint _salt) {
-        salt = _salt;
-    }
-}
-
-contract AddressPredictor {
-    constructor(uint _salt, bytes memory _bytecode) payable {
-        address deployed = address(new Predicted{salt: bytes32(_salt)}(_salt));
-        address predicted = predictAddress(_salt, _bytecode);
-        assert(deployed == predicted);
-    }
-
-    function predictAddress(
-        uint _foo,
-        bytes memory _bytecode
-    ) public view returns (address predicted) {
-        bytes32 addr = keccak256(
-            abi.encodePacked(
-                bytes1(0xff),
-                address(this),
-                bytes32(_foo),
-                keccak256(abi.encodePacked(_bytecode, abi.encode(_foo)))
-            )
-        );
-        predicted = address(uint160(uint(addr)));
-    }
-}

crates/integration/contracts/Balance.sol

@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Upload": {
-                "code": {
-                    "Solidity": {
-                        "contract": "BalanceReceiver"
-                    }
-                }
-            }
-        },
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "Balance"
-                    }
-                },
-                "value": 24
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "1c8d16b30000000000000000000000000303030303030303030303030303030303030303000000000000000000000000000000000000000000000000000000000000000a"
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "6ada15d90000000000000000000000000303030303030303030303030303030303030303000000000000000000000000000000000000000000000000000000000000000a"
-            }
-        }
-    ]
-}
-*/
-
-contract BalanceReceiver {
-    constructor() payable {}
-
-    fallback() external payable {}
-}
-
-contract Balance {
-    constructor() payable {
-        // 0 to EOA
-        transfer_to(payable(address(0xdeadbeef)), 0);
-        send_to(payable(address(0xdeadbeef)), 0);
-
-        // 1 to EOA
-        transfer_to(payable(address(0xcafebabe)), 1);
-        send_to(payable(address(0xcafebabe)), 1);
-
-        BalanceReceiver balanceReceiver = new BalanceReceiver();
-
-        // 0 to contract
-        transfer_to(payable(address(balanceReceiver)), 0);
-        send_to(payable(address(balanceReceiver)), 0);
-
-        // 1 to contract
-        transfer_to(payable(address(balanceReceiver)), 1);
-        send_to(payable(address(balanceReceiver)), 1);
-    }
-
-    function transfer_to(address payable _dest, uint _amount) public payable {
-        _dest.transfer(_amount);
-    }
-
-    function send_to(address payable _dest, uint _amount) public payable {
-        require(_dest.send(_amount));
-    }
-}

crates/integration/contracts/Coinbase.sol

@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "Coinbase"
-                    }
-                }
-            }
-        }
-    ]
-}
-*/
-
-contract Coinbase {
-    constructor() payable {
-        address coinbase = address(0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF);
-        assert(block.coinbase == coinbase);
-    }
-}

crates/integration/contracts/Create2.sol

@@ -1,50 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Upload": {
-                "code": {
-                    "Solidity": {
-                        "contract": "CreateA"
-                    }
-                }
-            }
-        },
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "CreateB"
-                    }
-                },
-                "value": 100000
-            }
-        }
-    ]
-}
-*/
-
-contract CreateA {
-    constructor() payable {}
-}
-
-contract CreateB {
-    constructor() payable {
-        bytes32 salt = hex"ff";
-
-        try new CreateA{salt: salt}() returns (CreateA) {} catch {
-            revert("the first instantiation should succeed");
-        }
-
-        try new CreateA{salt: salt}() returns (CreateA) {} catch {
-            return;
-        }
-
-        revert("the second instantiation should have failed");
-    }
-}

crates/integration/contracts/DelegateCaller.sol

@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.28;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "DelegateCaller"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "e466c6c9"
-            }
-        }
-    ]
-}
-*/
-
-contract DelegateCaller {
-    function delegateNoContract() external returns (bool) {
-        address testAddress = 0x0000000000000000000000000000000000000000;
-        (bool success, ) = testAddress.delegatecall(
-            abi.encodeWithSignature("test()")
-        );
-        return success;
-    }
-}

crates/integration/contracts/FunctionPointer.sol

@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "FunctionPointer"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "26121ff0"
-            }
-        }
-    ]
-}
-*/
-
-contract FunctionPointer {
-    bool public flag = false;
-
-    function f0() public {
-        flag = true;
-    }
-
-    function f() public returns (bool) {
-        function() internal x = f0;
-        x();
-        return flag;
-    }
-}

crates/integration/contracts/FunctionType.sol

@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.28;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "FunctionType"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "b8c9d365"
-            }
-        }
-    ]
-}
-*/
-
-contract FunctionType {
-    uint public immutable x = 42;
-
-    function h() public view returns (function() external view returns (uint)) {
-        return this.x;
-    }
-}

crates/integration/contracts/LayoutAt.sol

@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.29;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "LayoutAt"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "a7a0d537"
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "15393349"
-            }
-        }
-    ]
-}
-*/
-
-contract LayoutAt layout at 0xDEADBEEF + 0xCAFEBABE {
-    uint[3] public something;
-
-    constructor() payable {
-        something[0] = 1337;
-        something[1] = 42;
-        something[2] = 69;
-    }
-
-    function slotOfSomething() public pure returns (uint ret) {
-        assembly {
-            ret := something.slot
-        }
-    }
-}

crates/integration/contracts/MCopyOverlap.sol

@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "MCopyOverlap"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "afdce848"
-            }
-        }
-    ]
-}
-*/
-
-function copy(
-    uint dstOffset,
-    uint srcOffset,
-    uint length
-) pure returns (bytes memory out) {
-    out = hex"2222222222222222333333333333333344444444444444445555555555555555"
-    hex"6666666666666666777777777777777788888888888888889999999999999999"
-    hex"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd";
-    assembly {
-        mcopy(
-            add(add(out, 0x20), dstOffset),
-            add(add(out, 0x20), srcOffset),
-            length
-        )
-    }
-}
-
-contract MCopyOverlap {
-    function mcopy_to_right_overlap() public pure returns (bytes memory) {
-        return copy(0x20, 0x10, 0x30);
-    }
-}

crates/integration/contracts/MLoad.sol

@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.28;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "MLoad"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "e2179b8e"
-            }
-        }
-    ]
-}
-*/
-
-contract MLoad {
-    constructor() payable {
-        assert(g() == 0);
-    }
-
-    function g() public payable returns (uint m) {
-        assembly {
-            m := mload(0)
-        }
-    }
-}

crates/integration/contracts/Send.sol

@@ -1,75 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": false,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "Send"
-                    }
-                },
-                "value": 211
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "1c8d16b30000000000000000000000000303030303030303030303030303030303030303000000000000000000000000000000000000000000000000000000000000000a"
-            }
-        },
-        {
-            "VerifyCall": {
-                "success": true
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "fb9e8d050000000000000000000000000000000000000000000000000000000000000001"
-            }
-        },
-        {
-            "VerifyCall": {
-                "success": false
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "fb9e8d050000000000000000000000000000000000000000000000000000000000000000"
-            }
-        },
-        {
-            "VerifyCall": {
-                "success": false
-            }
-        }
-    ]
-}
-*/
-
-contract Send {
-    constructor() payable {}
-
-    function transfer_self(uint _amount) public payable {
-        transfer_to(payable(address(this)), _amount);
-    }
-
-    function transfer_to(address payable _dest, uint _amount) public payable {
-        if (_dest.send(_amount)) {}
-    }
-
-    fallback() external {}
-
-    receive() external payable {}
-}

crates/integration/contracts/Transfer.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8;
 
 /* runner.json
 {
-    "differential": false,
+    "differential": true,
     "actions": [
         {
             "Instantiate": {
@@ -12,7 +12,7 @@ pragma solidity ^0.8;
                         "contract": "Transfer"
                     }
                 },
-                "value": 211
+                "value": 11
             }
         },
         {
@@ -23,35 +23,12 @@ pragma solidity ^0.8;
                 "data": "1c8d16b30000000000000000000000000303030303030303030303030303030303030303000000000000000000000000000000000000000000000000000000000000000a"
             }
         },
-        {
-            "VerifyCall": {
-                "success": true
-            }
-        },
         {
             "Call": {
                 "dest": {
                     "Instantiated": 0
                 },
-                "data": "fb9e8d050000000000000000000000000000000000000000000000000000000000000001"
-            }
-        },
-        {
-            "VerifyCall": {
-                "success": false
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "fb9e8d050000000000000000000000000000000000000000000000000000000000000000"
-            }
-        },
-        {
-            "VerifyCall": {
-                "success": false
+                "data": "fb9e8d0500000000000000000000000003030303030303030303030303030303030303030000000000000000000000000000000000000000000000000000000000000001"
             }
         }
     ]
@@ -59,17 +36,19 @@ pragma solidity ^0.8;
 */
 
 contract Transfer {
-    constructor() payable {}
+    constructor() payable {
+        transfer_self(msg.value);
+    }
+
+    function address_self() internal view returns (address payable) {
+        return payable(address(this));
+    }
 
     function transfer_self(uint _amount) public payable {
-        transfer_to(payable(address(this)), _amount);
+        transfer_to(address_self(), _amount);
     }
 
     function transfer_to(address payable _dest, uint _amount) public payable {
         _dest.transfer(_amount);
     }
-
-    fallback() external {}
-
-    receive() external payable {}
 }

crates/integration/contracts/flipper.sol

@@ -15,7 +15,7 @@ pragma solidity ^0.8;
                 "Instantiated": 0
             },
             "key": "0000000000000000000000000000000000000000000000000000000000000000",
-            "expected": "0000000000000000000000000000000000000000000000000000000000000001"
+            "expected": "0100000000000000000000000000000000000000000000000000000000000000"
         }
     },
     {

crates/integration/src/cases.rs

@@ -1,7 +1,6 @@
 use alloy_primitives::{Address, Bytes, I256, U256};
 use alloy_sol_types::{sol, SolCall, SolConstructor};
 
-use revive_llvm_context::OptimizerSettings;
 use revive_solidity::test_utils::*;
 
 #[derive(Clone)]
@@ -157,20 +156,6 @@ case!("DivisionArithmetics.sol", DivisionArithmetics, sdivCall, division_arithme
 case!("DivisionArithmetics.sol", DivisionArithmetics, modCall, division_arithmetics_mod, n: U256, d: U256);
 case!("DivisionArithmetics.sol", DivisionArithmetics, smodCall, division_arithmetics_smod, n: I256, d: I256);
 
-sol!(
-    contract Send {
-        function transfer_self(uint _amount) public payable;
-    }
-);
-case!("Send.sol", Send, transfer_selfCall, send_self, amount: U256);
-
-sol!(
-    contract Transfer {
-        function transfer_self(uint _amount) public payable;
-    }
-);
-case!("Transfer.sol", Transfer, transfer_selfCall, transfer_self, amount: U256);
-
 sol!(
     contract MStore8 {
         function mStore8(uint value) public pure returns (uint256 word);
@@ -250,19 +235,8 @@ sol!(
 );
 case!("Storage.sol", Storage, transientCall, storage_transient, value: U256);
 
-sol!(
-    contract Predicted {
-        constructor(uint _foo);
-    }
-    contract AddressPredictor {
-        constructor(uint _foo, bytes memory _bytecode) payable;
-    }
-);
-case!("AddressPredictor.sol", Predicted, constructorCall, predicted_constructor, salt: U256);
-case!("AddressPredictor.sol", AddressPredictor, constructorCall, address_predictor_constructor, salt: U256, bytecode: Bytes);
-
 impl Contract {
-    pub fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
+    fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
         Self {
             name,
             evm_runtime: compile_evm_bin_runtime(name, code),
@@ -270,19 +244,11 @@ impl Contract {
             calldata,
         }
     }
-
-    pub fn build_size_opt(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
-        Self {
-            name,
-            evm_runtime: compile_evm_bin_runtime(name, code),
-            pvm_runtime: compile_blob_with_options(name, code, true, OptimizerSettings::size()),
-            calldata,
-        }
-    }
 }
 
 #[cfg(test)]
 mod tests {
+    use alloy_primitives::{Bytes, U256};
     use rayon::iter::{IntoParallelIterator, ParallelIterator};
     use serde::{de::Deserialize, Serialize};
     use std::{collections::BTreeMap, fs::File};
@@ -322,47 +288,14 @@ mod tests {
         };
 
         [
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "Baseline",
-                    include_str!("../contracts/Baseline.sol"),
-                )
-            }) as _,
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "Flipper",
-                    include_str!("../contracts/flipper.sol"),
-                )
-            }) as _,
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "Computation",
-                    include_str!("../contracts/Computation.sol"),
-                )
-            }) as _,
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "FibonacciIterative",
-                    include_str!("../contracts/Fibonacci.sol"),
-                )
-            }) as _,
-            (|| Contract::build_size_opt(vec![], "ERC20", include_str!("../contracts/ERC20.sol")))
-                as _,
-            (|| Contract::build_size_opt(vec![], "SHA1", include_str!("../contracts/SHA1.sol")))
-                as _,
-            (|| {
-                Contract::build_size_opt(
-                    vec![],
-                    "DivisionArithmetics",
-                    include_str!("../contracts/DivisionArithmetics.sol"),
-                )
-            }) as _,
-            (|| Contract::build_size_opt(vec![], "Events", include_str!("../contracts/Events.sol")))
-                as _,
+            Contract::baseline as fn() -> Contract,
+            Contract::flipper as fn() -> Contract,
+            (|| Contract::odd_product(0)) as fn() -> Contract,
+            (|| Contract::fib_iterative(U256::ZERO)) as fn() -> Contract,
+            Contract::erc20 as fn() -> Contract,
+            (|| Contract::sha1(Bytes::new())) as fn() -> Contract,
+            (|| Contract::division_arithmetics_div(U256::ZERO, U256::ZERO)) as fn() -> Contract,
+            (|| Contract::event(U256::ZERO)) as fn() -> Contract,
         ]
         .into_par_iter()
         .map(extract_code_size)

crates/integration/src/tests.rs

@@ -33,15 +33,14 @@ test_spec!(msize, "MSize", "MSize.sol");
 test_spec!(sha1, "SHA1", "SHA1.sol");
 test_spec!(block, "Block", "Block.sol");
 test_spec!(mcopy, "MCopy", "MCopy.sol");
-test_spec!(mcopy_overlap, "MCopyOverlap", "MCopyOverlap.sol");
 test_spec!(events, "Events", "Events.sol");
 test_spec!(storage, "Storage", "Storage.sol");
 test_spec!(mstore8, "MStore8", "MStore8.sol");
 test_spec!(address, "Context", "Context.sol");
-test_spec!(value, "Value", "Value.sol");
+test_spec!(balance, "Value", "Value.sol");
 test_spec!(create, "CreateB", "Create.sol");
 test_spec!(call, "Caller", "Call.sol");
-test_spec!(balance, "Balance", "Balance.sol");
+test_spec!(transfer, "Transfer", "Transfer.sol");
 test_spec!(return_data_oob, "ReturnDataOob", "ReturnDataOob.sol");
 test_spec!(immutables, "Immutables", "Immutables.sol");
 test_spec!(transaction, "Transaction", "Transaction.sol");
@@ -51,15 +50,6 @@ test_spec!(gas_price, "GasPrice", "GasPrice.sol");
 test_spec!(gas_left, "GasLeft", "GasLeft.sol");
 test_spec!(gas_limit, "GasLimit", "GasLimit.sol");
 test_spec!(base_fee, "BaseFee", "BaseFee.sol");
-test_spec!(coinbase, "Coinbase", "Coinbase.sol");
-test_spec!(create2, "CreateB", "Create2.sol");
-test_spec!(transfer, "Transfer", "Transfer.sol");
-test_spec!(send, "Send", "Send.sol");
-test_spec!(function_pointer, "FunctionPointer", "FunctionPointer.sol");
-test_spec!(mload, "MLoad", "MLoad.sol");
-test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
-test_spec!(function_type, "FunctionType", "FunctionType.sol");
-test_spec!(layout_at, "LayoutAt", "LayoutAt.sol");
 
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
     vec![Instantiate {
@@ -71,6 +61,7 @@ fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
             path: Some(path.into()),
             contract: contract.to_string(),
             solc_optimizer: None,
+            pipeline: None,
         },
         data: vec![],
         salt: OptionalHex::default(),
@@ -363,6 +354,7 @@ fn ext_code_size() {
                     path: Some("contracts/Baseline.sol".into()),
                     contract: "Baseline".to_string(),
                     solc_optimizer: None,
+                    pipeline: None,
                 },
                 data: vec![],
                 salt: OptionalHex::from([0; 32]),
@@ -443,74 +435,32 @@ fn ext_code_size() {
     .run();
 }
 
-#[test]
-#[should_panic(expected = "ReentranceDenied")]
-fn send_denies_reentrancy() {
-    let value = 1000;
-    Specs {
-        actions: vec![
-            instantiate("contracts/Send.sol", "Send").remove(0),
-            Call {
-                origin: TestAddress::Alice,
-                dest: TestAddress::Instantiated(0),
-                value,
-                gas_limit: None,
-                storage_deposit_limit: None,
-                data: Contract::send_self(U256::from(value)).calldata,
-            },
-        ],
-        differential: false,
-        ..Default::default()
-    }
-    .run();
-}
+/*
+// These test were implement for the mock-runtime and need to be ported yet.
 
 #[test]
-#[should_panic(expected = "ReentranceDenied")]
-fn transfer_denies_reentrancy() {
-    let value = 1000;
-    Specs {
-        actions: vec![
-            instantiate("contracts/Transfer.sol", "Transfer").remove(0),
-            Call {
-                origin: TestAddress::Alice,
-                dest: TestAddress::Instantiated(0),
-                value,
-                gas_limit: None,
-                storage_deposit_limit: None,
-                data: Contract::transfer_self(U256::from(value)).calldata,
-            },
-        ],
-        differential: false,
-        ..Default::default()
-    }
-    .run();
-}
+fn create2_failure() {
+    let mut state = State::default();
+    let contract_a = Contract::create_a();
+    state.upload_code(&contract_a.pvm_runtime);
 
-#[test]
-fn create2_salt() {
-    let salt = U256::from(777);
-    let predicted = Contract::predicted_constructor(salt).pvm_runtime;
-    let predictor = Contract::address_predictor_constructor(salt, predicted.clone().into());
-    Specs {
-        actions: vec![
-            Upload {
-                origin: TestAddress::Alice,
-                code: Code::Bytes(predicted),
-                storage_deposit_limit: None,
-            },
-            Instantiate {
-                origin: TestAddress::Alice,
-                value: 0,
-                gas_limit: Some(GAS_LIMIT),
-                storage_deposit_limit: None,
-                code: Code::Bytes(predictor.pvm_runtime),
-                data: predictor.calldata,
-                salt: OptionalHex::default(),
-            },
-        ],
-        differential: false,
-        ..Default::default()
-    }
-    .run();
+    let contract = Contract::create_b();
+    let (state, output) = state
+        .transaction()
+        .with_default_account(&contract.pvm_runtime)
+        .calldata(contract.calldata.clone())
+        .call();
+
+    assert_eq!(output.flags, ReturnFlags::Success);
+
+    // The address already exists, which should cause the contract to revert
+
+    let (_, output) = state
+        .transaction()
+        .with_default_account(&contract.pvm_runtime)
+        .calldata(contract.calldata)
+        .call();
+
+    assert_eq!(output.flags, ReturnFlags::Revert);
 }
+*/

crates/linker/src/lib.rs

@@ -52,6 +52,7 @@ pub fn link<T: AsRef<[u8]>>(input: T) -> anyhow::Result<Vec<u8>> {
 
     let ld_args = [
         "ld.lld",
+        "--lto=full",
         "--error-limit=0",
         "--relocatable",
         "--emit-relocs",

crates/lld-sys/build.rs

@@ -96,7 +96,7 @@ fn main() {
     revive_build_utils::llvm_cxx_flags()
         .split_whitespace()
         .fold(&mut cc::Build::new(), |builder, flag| builder.flag(flag))
-        .warnings(false)
+        .flag("-Wno-unused-parameter")
         .cpp(true)
         .file("src/linker.cpp")
         .compile("liblinker.a");

crates/llvm-builder/Cargo.toml

@@ -32,7 +32,6 @@ tar = { workspace = true }
 flate2 = { workspace = true }
 env_logger = { workspace = true }
 log = { workspace = true }
-which = { workspace = true }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }

crates/llvm-builder/src/builtins.rs

@@ -1,8 +1,5 @@
 //! Utilities for compiling the LLVM compiler-rt builtins.
 
-use crate::utils::path_windows_to_unix as to_unix;
-use std::{env::consts::EXE_EXTENSION, process::Command};
-
 /// Static CFLAGS variable passed to the compiler building the compiler-rt builtins.
 const C_FLAGS: [&str; 6] = [
     "--target=riscv64",
@@ -47,31 +44,24 @@ fn cmake_dynamic_args(
 
     let mut clang_path = llvm_target_host.to_path_buf();
     clang_path.push("bin/clang");
-    clang_path.set_extension(EXE_EXTENSION);
 
     let mut clangxx_path = llvm_target_host.to_path_buf();
     clangxx_path.push("bin/clang++");
-    clangxx_path.set_extension(EXE_EXTENSION);
 
     let mut llvm_config_path = llvm_target_host.to_path_buf();
     llvm_config_path.push("bin/llvm-config");
-    llvm_config_path.set_extension(EXE_EXTENSION);
 
     let mut ar_path = llvm_target_host.to_path_buf();
     ar_path.push("bin/llvm-ar");
-    ar_path.set_extension(EXE_EXTENSION);
 
     let mut nm_path = llvm_target_host.to_path_buf();
     nm_path.push("bin/llvm-nm");
-    nm_path.set_extension(EXE_EXTENSION);
 
     let mut ranlib_path = llvm_target_host.to_path_buf();
     ranlib_path.push("bin/llvm-ranlib");
-    ranlib_path.set_extension(EXE_EXTENSION);
 
     let mut linker_path = llvm_target_host.to_path_buf();
     linker_path.push("bin/ld.lld");
-    linker_path.set_extension(EXE_EXTENSION);
 
     Ok([
         format!(
@@ -86,18 +76,12 @@ fn cmake_dynamic_args(
         format!("-DCMAKE_C_FLAGS='{}'", C_FLAGS.join(" ")),
         format!("-DCMAKE_ASM_FLAGS='{}'", C_FLAGS.join(" ")),
         format!("-DCMAKE_CXX_FLAGS='{}'", C_FLAGS.join(" ")),
-        format!(
-            "-DCMAKE_C_COMPILER='{}'",
-            to_unix(clang_path.clone())?.display()
-        ),
-        format!("-DCMAKE_ASM_COMPILER='{}'", to_unix(clang_path)?.display()),
-        format!(
-            "-DCMAKE_CXX_COMPILER='{}'",
-            to_unix(clangxx_path)?.display()
-        ),
-        format!("-DCMAKE_AR='{}'", to_unix(ar_path)?.display()),
-        format!("-DCMAKE_NM='{}'", to_unix(nm_path)?.display()),
-        format!("-DCMAKE_RANLIB='{}'", to_unix(ranlib_path)?.display()),
+        format!("-DCMAKE_C_COMPILER='{}'", clang_path.to_string_lossy()),
+        format!("-DCMAKE_ASM_COMPILER='{}'", clang_path.to_string_lossy()),
+        format!("-DCMAKE_CXX_COMPILER='{}'", clangxx_path.to_string_lossy()),
+        format!("-DCMAKE_AR='{}'", ar_path.to_string_lossy()),
+        format!("-DCMAKE_NM='{}'", nm_path.to_string_lossy()),
+        format!("-DCMAKE_RANLIB='{}'", ranlib_path.to_string_lossy()),
         format!(
             "-DLLVM_CONFIG_PATH='{}'",
             llvm_config_path.to_string_lossy()
@@ -117,13 +101,7 @@ pub fn build(
     log::info!("building compiler-rt for rv64emac");
 
     crate::utils::check_presence("cmake")?;
-
-    let generator = if cfg!(target_os = "windows") {
-        "Visual Studio 17 2022"
-    } else {
-        crate::utils::check_presence("ninja")?;
-        "Ninja"
-    };
+    crate::utils::check_presence("ninja")?;
 
     let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
     let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
@@ -136,7 +114,7 @@ pub fn build(
                 "-B",
                 llvm_compiler_rt_build.to_string_lossy().as_ref(),
                 "-G",
-                generator,
+                "Ninja",
             ])
             .args(CMAKE_STATIC_ARGS)
             .args(cmake_dynamic_args(build_type, target_env)?)
@@ -153,17 +131,7 @@ pub fn build(
         "LLVM compiler-rt building cmake",
     )?;
 
-    crate::utils::command(
-        Command::new("cmake").args([
-            "--build",
-            llvm_compiler_rt_build.to_string_lossy().as_ref(),
-            "--target",
-            "install",
-            "--config",
-            build_type.to_string().as_str(),
-        ]),
-        "Building",
-    )?;
+    crate::utils::ninja(&llvm_compiler_rt_build)?;
 
     Ok(())
 }

crates/llvm-builder/src/lib.rs

@@ -214,7 +214,7 @@ pub fn build(
                 sanitizer,
             )?;
         } else if cfg!(target_os = "windows") {
-            platforms::x86_64_windows_msvc::build(
+            platforms::x86_64_windows_gnu::build(
                 build_type,
                 targets,
                 llvm_projects,

crates/llvm-builder/src/platforms/mod.rs

@@ -8,7 +8,7 @@ pub mod wasm32_emscripten;
 pub mod x86_64_linux_gnu;
 pub mod x86_64_linux_musl;
 pub mod x86_64_macos;
-pub mod x86_64_windows_msvc;
+pub mod x86_64_windows_gnu;
 
 use std::str::FromStr;
 

crates/llvm-builder/src/platforms/shared.rs

@@ -8,7 +8,7 @@ use std::path::Path;
 use std::process::Command;
 
 /// The build options shared by all platforms.
-pub const SHARED_BUILD_OPTS: [&str; 21] = [
+pub const SHARED_BUILD_OPTS: [&str; 19] = [
     "-DPACKAGE_VENDOR='Parity Technologies'",
     "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1",
     "-DLLVM_BUILD_DOCS='Off'",
@@ -28,8 +28,6 @@ pub const SHARED_BUILD_OPTS: [&str; 21] = [
     "-DCMAKE_EXPORT_COMPILE_COMMANDS='On'",
     "-DPython3_FIND_REGISTRY='LAST'", // Use Python version from $PATH, not from registry
     "-DBUG_REPORT_URL='https://github.com/paritytech/contract-issues/issues/'",
-    "-DCLANG_ENABLE_ARCMT='Off'",
-    "-DCLANG_ENABLE_STATIC_ANALYZER='Off'",
 ];
 
 /// The build options shared by all platforms except MUSL.
@@ -42,9 +40,17 @@ pub const SHARED_BUILD_OPTS_NOT_MUSL: [&str; 4] = [
 
 /// The shared build options to treat warnings as errors.
 ///
-/// Disabled because it makes the build very brittle.
-pub fn shared_build_opts_werror(_target_env: TargetEnv) -> Vec<String> {
-    vec!["-DLLVM_ENABLE_WERROR='Off'".to_string()]
+/// Disabled on Windows due to the following upstream issue with MSYS2 with mingw-w64:
+/// ProgramTest.cpp:23:15: error: '__p__environ' redeclared without 'dllimport' attribute
+pub fn shared_build_opts_werror(target_env: TargetEnv) -> Vec<String> {
+    vec![format!(
+        "-DLLVM_ENABLE_WERROR='{}'",
+        if cfg!(target_os = "windows") || target_env == TargetEnv::Emscripten {
+            "Off"
+        } else {
+            "On"
+        },
+    )]
 }
 
 /// The build options to set the default target.

crates/llvm-builder/src/platforms/wasm32_emscripten.rs

@@ -141,7 +141,7 @@ fn build_target(
         Command::new("emcmake")
             .env("EMCC_DEBUG", "2")
             .env("CXXFLAGS", "-Dwait4=__syscall_wait4")
-            .env("LDFLAGS", "-lnodefs.js -s NO_INVOKE_RUN=1 -s EXIT_RUNTIME=1 -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_RUNTIME_METHODS=FS,callMain,NODEFS -s MODULARIZE=1 -s WASM_BIGINT=1 -s ALLOW_TABLE_GROWTH=1 -s NODEJS_CATCH_EXIT=0 -sDYNAMIC_EXECUTION=0")
+            .env("LDFLAGS", "-lnodefs.js -s NO_INVOKE_RUN -s EXIT_RUNTIME -s INITIAL_MEMORY=64MB -s ALLOW_MEMORY_GROWTH -s EXPORTED_RUNTIME_METHODS=FS,callMain,NODEFS -s MODULARIZE -s EXPORT_ES6 -s WASM_BIGINT")
             .arg("cmake")
             .args([
                 "-S",

crates/llvm-builder/src/platforms/x86_64_windows_gnu.rs

@@ -1,6 +1,7 @@
 //! The revive LLVM amd64 `windows-gnu` builder.
 
 use std::collections::HashSet;
+use std::path::PathBuf;
 use std::process::Command;
 
 use crate::build_type::BuildType;
@@ -27,6 +28,10 @@ pub fn build(
     sanitizer: Option<Sanitizer>,
 ) -> anyhow::Result<()> {
     crate::utils::check_presence("cmake")?;
+    crate::utils::check_presence("clang")?;
+    crate::utils::check_presence("clang++")?;
+    crate::utils::check_presence("lld")?;
+    crate::utils::check_presence("ninja")?;
 
     let llvm_module_llvm =
         LLVMPath::llvm_module_llvm().and_then(crate::utils::path_windows_to_unix)?;
@@ -43,12 +48,15 @@ pub fn build(
                 "-B",
                 llvm_build_final.to_string_lossy().as_ref(),
                 "-G",
-                "Visual Studio 17 2022",
+                "Ninja",
                 format!(
                     "-DCMAKE_INSTALL_PREFIX='{}'",
                     llvm_target_final.to_string_lossy().as_ref(),
                 )
                 .as_str(),
+                format!("-DCMAKE_BUILD_TYPE='{build_type}'").as_str(),
+                "-DCMAKE_C_COMPILER='clang'",
+                "-DCMAKE_CXX_COMPILER='clang++'",
                 format!(
                     "-DLLVM_TARGETS_TO_BUILD='{}'",
                     targets
@@ -67,7 +75,7 @@ pub fn build(
                         .join(";")
                 )
                 .as_str(),
-                "-DLLVM_BUILD_LLVM_C_DYLIB=Off",
+                "-DLLVM_USE_LINKER='lld'",
             ])
             .args(crate::platforms::shared::shared_build_opts_default_target(
                 default_target,
@@ -99,16 +107,20 @@ pub fn build(
         "LLVM building cmake",
     )?;
 
-    crate::utils::command(
-        Command::new("cmake").args([
-            "--build",
-            llvm_build_final.to_string_lossy().as_ref(),
-            "--target",
-            "install",
-            "--config",
-            build_type.to_string().as_str(),
-        ]),
-        "Building with msbuild",
+    crate::utils::ninja(llvm_build_final.as_ref())?;
+
+    let libstdcpp_source_path = match std::env::var("LIBSTDCPP_SOURCE_PATH") {
+        Ok(libstdcpp_source_path) => PathBuf::from(libstdcpp_source_path),
+        Err(error) => anyhow::bail!(
+            "The `LIBSTDCPP_SOURCE_PATH` must be set to the path to the libstdc++.a static library: {}", error
+        ),
+    };
+    let mut libstdcpp_destination_path = llvm_target_final;
+    libstdcpp_destination_path.push("./lib/libstdc++.a");
+    fs_extra::file::copy(
+        crate::utils::path_windows_to_unix(libstdcpp_source_path)?,
+        crate::utils::path_windows_to_unix(libstdcpp_destination_path)?,
+        &fs_extra::file::CopyOptions::default(),
     )?;
 
     Ok(())

crates/llvm-builder/src/utils.rs

@@ -7,7 +7,6 @@ use std::process::Command;
 use std::process::Stdio;
 use std::time::Duration;
 
-use anyhow::Context;
 use path_slash::PathBufExt;
 
 /// The LLVM host repository URL.
@@ -132,8 +131,11 @@ pub fn path_windows_to_unix<P: AsRef<Path> + PathBufExt>(path: P) -> anyhow::Res
 
 /// Checks if the tool exists in the system.
 pub fn check_presence(name: &str) -> anyhow::Result<()> {
-    which::which(name).with_context(|| format!("Tool `{name}` is missing. Please install"))?;
-    Ok(())
+    let description = &format!("checking the `{name}` executable");
+    log::info!("{description}");
+
+    command(Command::new("which").arg(name), description)
+        .map_err(|_| anyhow::anyhow!("Tool `{}` is missing. Please install", name))
 }
 
 /// Identify XCode version using `pkgutil`.

crates/llvm-builder/tests/build.rs

@@ -53,16 +53,6 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
         .assert()
         .success();
 
-    Command::cargo_bin(common::REVIVE_LLVM)?
-        .current_dir(test_dir.path())
-        .arg("build")
-        .arg("--llvm-projects")
-        .arg("clang")
-        .arg("--llvm-projects")
-        .arg("lld")
-        .assert()
-        .success();
-
     Command::cargo_bin(common::REVIVE_LLVM)?
         .arg("--target-env")
         .arg("musl")
@@ -75,6 +65,12 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
         .assert()
         .success();
 
+    Command::cargo_bin(common::REVIVE_LLVM)?
+        .current_dir(test_dir.path())
+        .arg("builtins")
+        .assert()
+        .success();
+
     Command::cargo_bin(common::REVIVE_LLVM)?
         .current_dir(test_dir.path())
         .arg("clean")
@@ -87,7 +83,6 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
 /// This test verifies that the LLVM repository can be successfully cloned and built in debug mode
 /// with tests and coverage enabled.
 #[test]
-#[cfg(target_os = "linux")]
 fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
 
@@ -104,10 +99,6 @@ fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
         .arg("--enable-tests")
         .arg("--build-type")
         .arg("Debug")
-        .arg("--llvm-projects")
-        .arg("clang")
-        .arg("--llvm-projects")
-        .arg("lld")
         .assert()
         .success();
 
@@ -116,7 +107,6 @@ fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
 
 /// This test verifies that the LLVM repository can be successfully built with address sanitizer.
 #[test]
-#[cfg(target_os = "linux")]
 fn build_with_sanitizers() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
 
@@ -131,10 +121,6 @@ fn build_with_sanitizers() -> anyhow::Result<()> {
         .arg("build")
         .arg("--sanitizer")
         .arg("Address")
-        .arg("--llvm-projects")
-        .arg("lld")
-        .arg("--llvm-projects")
-        .arg("clang")
         .assert()
         .success();
 
@@ -143,36 +129,15 @@ fn build_with_sanitizers() -> anyhow::Result<()> {
 
 /// Tests the clone, build, and clean process of the LLVM repository for the emscripten target.
 #[test]
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "macos"))]
 fn clone_build_and_clean_emscripten() -> anyhow::Result<()> {
     let test_dir = common::TestDir::with_lockfile(None)?;
     let command = Command::cargo_bin(common::REVIVE_LLVM)?;
     let program = command.get_program().to_string_lossy();
-
-    Command::cargo_bin(common::REVIVE_LLVM)?
-        .current_dir(test_dir.path())
-        .arg("clone")
-        .assert()
-        .success();
-
-    Command::cargo_bin(common::REVIVE_LLVM)?
-        .current_dir(test_dir.path())
-        .arg("build")
-        .arg("--llvm-projects")
-        .arg("lld")
-        .arg("--llvm-projects")
-        .arg("clang")
-        .assert()
-        .success();
-
-    // Two little shell-dependent things here:
-    // Doing `. ./emsdk_env.sh` instead of `source`, as `source` might be missing in some shells
-    // `cd {} && . ./emsdk_env.sh && cd ..` helps the script to locate `emsdk.py`
-    // @see https://github.com/emscripten-core/emsdk/blob/9dbdc4b3437750b85d16931c7c801bb71a782122/emsdk_env.sh#L61-L69
     let emsdk_wrapped_build_command = format!(
         "{program} --target-env emscripten clone && \
-        cd {} && . ./emsdk_env.sh && cd .. && \
-        {program} --target-env emscripten build --llvm-projects lld",
+        source {}emsdk_env.sh && \
+        {program} --target-env emscripten build --llvm-projects clang --llvm-projects lld",
         revive_llvm_builder::LLVMPath::DIRECTORY_EMSDK_SOURCE,
     );
 

crates/llvm-context/Cargo.toml

@@ -21,8 +21,8 @@ serde = { workspace = true, features = ["derive"] }
 num = { workspace = true }
 hex = { workspace = true }
 sha3 = { workspace = true }
+md5 = { workspace = true }
 inkwell = { workspace = true }
-libc = { workspace = true }
 polkavm-disassembler = { workspace = true }
 polkavm-common = { workspace = true }
 
@@ -30,4 +30,3 @@ revive-common = { workspace = true }
 revive-runtime-api = { workspace = true }
 revive-linker = { workspace = true }
 revive-stdlib = { workspace = true }
-revive-solc-json-interface = { workspace = true }

crates/llvm-context/src/debug_config/ir_type.rs

@@ -1,11 +1,16 @@
 //! The debug IR type.
 
 /// The debug IR type.
+#[allow(non_camel_case_types)]
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum IRType {
     /// Whether to dump the Yul code.
     Yul,
+    /// Whether to dump the EVM legacy assembly code.
+    EVMLA,
+    /// Whether to dump the Ethereal IR code.
+    EthIR,
     /// Whether to dump the LLVM IR code.
     LLVM,
     /// Whether to dump the assembly code.
@@ -22,6 +27,8 @@ impl IRType {
     pub fn file_extension(&self) -> &'static str {
         match self {
             Self::Yul => revive_common::EXTENSION_YUL,
+            Self::EthIR => revive_common::EXTENSION_ETHIR,
+            Self::EVMLA => revive_common::EXTENSION_EVMLA,
             Self::LLVM => revive_common::EXTENSION_LLVM_SOURCE,
             Self::Assembly => revive_common::EXTENSION_POLKAVM_ASSEMBLY,
             #[cfg(debug_assertions)]

crates/llvm-context/src/debug_config/mod.rs

@@ -39,6 +39,30 @@ impl DebugConfig {
         Ok(())
     }
 
+    /// Dumps the EVM legacy assembly IR.
+    pub fn dump_evmla(&self, contract_path: &str, code: &str) -> anyhow::Result<()> {
+        if let Some(output_directory) = self.output_directory.as_ref() {
+            let mut file_path = output_directory.to_owned();
+            let full_file_name = Self::full_file_name(contract_path, None, IRType::EVMLA);
+            file_path.push(full_file_name);
+            std::fs::write(file_path, code)?;
+        }
+
+        Ok(())
+    }
+
+    /// Dumps the Ethereal IR.
+    pub fn dump_ethir(&self, contract_path: &str, code: &str) -> anyhow::Result<()> {
+        if let Some(output_directory) = self.output_directory.as_ref() {
+            let mut file_path = output_directory.to_owned();
+            let full_file_name = Self::full_file_name(contract_path, None, IRType::EthIR);
+            file_path.push(full_file_name);
+            std::fs::write(file_path, code)?;
+        }
+
+        Ok(())
+    }
+
     /// Dumps the unoptimized LLVM IR.
     pub fn dump_llvm_ir_unoptimized(
         &self,

crates/llvm-context/src/lib.rs

@@ -1,7 +1,9 @@
 //! The LLVM context library.
 
-use std::ffi::CString;
-use std::sync::OnceLock;
+pub(crate) mod debug_config;
+pub(crate) mod optimizer;
+pub(crate) mod polkavm;
+pub(crate) mod target_machine;
 
 pub use self::debug_config::ir_type::IRType as DebugConfigIR;
 pub use self::debug_config::DebugConfig;
@@ -15,31 +17,26 @@ pub use self::polkavm::context::attribute::Attribute as PolkaVMAttribute;
 pub use self::polkavm::context::build::Build as PolkaVMBuild;
 pub use self::polkavm::context::code_type::CodeType as PolkaVMCodeType;
 pub use self::polkavm::context::debug_info::DebugInfo;
+pub use self::polkavm::context::evmla_data::EVMLAData as PolkaVMContextEVMLAData;
+pub use self::polkavm::context::function::block::evmla_data::key::Key as PolkaVMFunctionBlockKey;
+pub use self::polkavm::context::function::block::evmla_data::EVMLAData as PolkaVMFunctionBlockEVMLAData;
+pub use self::polkavm::context::function::block::Block as PolkaVMFunctionBlock;
 pub use self::polkavm::context::function::declaration::Declaration as PolkaVMFunctionDeclaration;
+pub use self::polkavm::context::function::evmla_data::EVMLAData as PolkaVMFunctionEVMLAData;
 pub use self::polkavm::context::function::intrinsics::Intrinsics as PolkaVMIntrinsicFunction;
 pub use self::polkavm::context::function::llvm_runtime::LLVMRuntime as PolkaVMLLVMRuntime;
 pub use self::polkavm::context::function::r#return::Return as PolkaVMFunctionReturn;
-pub use self::polkavm::context::function::runtime::arithmetics::Division as PolkaVMDivisionFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::Remainder as PolkaVMRemainderFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::SignedDivision as PolkaVMSignedDivisionFunction;
-pub use self::polkavm::context::function::runtime::arithmetics::SignedRemainder as PolkaVMSignedRemainderFunction;
 pub use self::polkavm::context::function::runtime::deploy_code::DeployCode as PolkaVMDeployCodeFunction;
 pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryFunction;
-pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
-pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
+pub use self::polkavm::context::function::runtime::immutable_data_load::ImmutableDataLoad as PolkaVMImmutableDataLoadFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
 pub use self::polkavm::context::function::runtime::FUNCTION_DEPLOY_CODE as PolkaVMFunctionDeployCode;
 pub use self::polkavm::context::function::runtime::FUNCTION_ENTRY as PolkaVMFunctionEntry;
+pub use self::polkavm::context::function::runtime::FUNCTION_LOAD_IMMUTABLE_DATA as PolkaVMFunctionImmutableDataLoad;
 pub use self::polkavm::context::function::runtime::FUNCTION_RUNTIME_CODE as PolkaVMFunctionRuntimeCode;
 pub use self::polkavm::context::function::yul_data::YulData as PolkaVMFunctionYulData;
 pub use self::polkavm::context::function::Function as PolkaVMFunction;
 pub use self::polkavm::context::global::Global as PolkaVMGlobal;
-pub use self::polkavm::context::pointer::heap::LoadWord as PolkaVMLoadHeapWordFunction;
-pub use self::polkavm::context::pointer::heap::StoreWord as PolkaVMStoreHeapWordFunction;
-pub use self::polkavm::context::pointer::storage::LoadTransientWord as PolkaVMLoadTransientStorageWordFunction;
-pub use self::polkavm::context::pointer::storage::LoadWord as PolkaVMLoadStorageWordFunction;
-pub use self::polkavm::context::pointer::storage::StoreTransientWord as PolkaVMStoreTransientStorageWordFunction;
-pub use self::polkavm::context::pointer::storage::StoreWord as PolkaVMStoreStorageWordFunction;
 pub use self::polkavm::context::pointer::Pointer as PolkaVMPointer;
 pub use self::polkavm::context::r#loop::Loop as PolkaVMLoop;
 pub use self::polkavm::context::solidity_data::SolidityData as PolkaVMContextSolidityData;
@@ -55,17 +52,14 @@ pub use self::polkavm::evm::create as polkavm_evm_create;
 pub use self::polkavm::evm::crypto as polkavm_evm_crypto;
 pub use self::polkavm::evm::ether_gas as polkavm_evm_ether_gas;
 pub use self::polkavm::evm::event as polkavm_evm_event;
-pub use self::polkavm::evm::event::EventLog as PolkaVMEventLogFunction;
 pub use self::polkavm::evm::ext_code as polkavm_evm_ext_code;
 pub use self::polkavm::evm::immutable as polkavm_evm_immutable;
-pub use self::polkavm::evm::immutable::Load as PolkaVMLoadImmutableDataFunction;
-pub use self::polkavm::evm::immutable::Store as PolkaVMStoreImmutableDataFunction;
-
 pub use self::polkavm::evm::math as polkavm_evm_math;
 pub use self::polkavm::evm::memory as polkavm_evm_memory;
 pub use self::polkavm::evm::r#return as polkavm_evm_return;
 pub use self::polkavm::evm::return_data as polkavm_evm_return_data;
 pub use self::polkavm::evm::storage as polkavm_evm_storage;
+pub use self::polkavm::metadata_hash::MetadataHash as PolkaVMMetadataHash;
 pub use self::polkavm::r#const as polkavm_const;
 pub use self::polkavm::Dependency as PolkaVMDependency;
 pub use self::polkavm::DummyDependency as PolkaVMDummyDependency;
@@ -74,41 +68,9 @@ pub use self::polkavm::WriteLLVM as PolkaVMWriteLLVM;
 pub use self::target_machine::target::Target;
 pub use self::target_machine::TargetMachine;
 
-pub(crate) mod debug_config;
-pub(crate) mod optimizer;
-pub(crate) mod polkavm;
-pub(crate) mod target_machine;
-
-static DID_INITIALIZE: OnceLock<()> = OnceLock::new();
-
-/// Initializes the LLVM compiler backend.
-///
-/// This is a no-op if called subsequentially.
-///
-/// `llvm_arguments` are passed as-is to the LLVM CL options parser.
-pub fn initialize_llvm(target: Target, name: &str, llvm_arguments: &[String]) {
-    let Ok(_) = DID_INITIALIZE.set(()) else {
-        return; // Tests don't go through a recursive process
-    };
-
-    let argv = [name.to_string()]
-        .iter()
-        .chain(llvm_arguments)
-        .map(|arg| CString::new(arg.as_bytes()).unwrap())
-        .collect::<Vec<_>>();
-    let argv: Vec<*const libc::c_char> = argv.iter().map(|arg| arg.as_ptr()).collect();
-    let overview = CString::new("").unwrap();
-    unsafe {
-        inkwell::llvm_sys::support::LLVMParseCommandLineOptions(
-            argv.len() as i32,
-            argv.as_ptr(),
-            overview.as_ptr(),
-        );
-    }
-
-    inkwell::support::enable_llvm_pretty_stack_trace();
-
+/// Initializes the target machine.
+pub fn initialize_target(target: Target) {
     match target {
-        Target::PVM => inkwell::targets::Target::initialize_riscv(&Default::default()),
+        Target::PVM => self::polkavm::initialize_target(),
     }
 }

crates/llvm-context/src/optimizer/settings/mod.rs

@@ -2,7 +2,6 @@
 
 pub mod size_level;
 
-use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -227,18 +226,3 @@ impl std::fmt::Display for Settings {
         )
     }
 }
-
-impl TryFrom<&SolcStandardJsonInputSettingsOptimizer> for Settings {
-    type Error = anyhow::Error;
-
-    fn try_from(value: &SolcStandardJsonInputSettingsOptimizer) -> Result<Self, Self::Error> {
-        let mut result = match value.mode {
-            Some(mode) => Self::try_from_cli(mode)?,
-            None => Self::cycles(),
-        };
-        if value.fallback_to_optimizing_for_size.unwrap_or_default() {
-            result.enable_fallback_to_size();
-        }
-        Ok(result)
-    }
-}

crates/llvm-context/src/polkavm/const/mod.rs

@@ -6,9 +6,15 @@ pub const LLVM_VERSION: semver::Version = semver::Version::new(18, 1, 4);
 /// The pointer width sized type.
 pub static XLEN: usize = revive_common::BIT_LENGTH_X32;
 
+/// The heap memory pointer pointer global variable name.
+pub static GLOBAL_HEAP_MEMORY_POINTER: &str = "memory_pointer";
+
 /// The calldata size global variable name.
 pub static GLOBAL_CALLDATA_SIZE: &str = "calldatasize";
 
+/// The call flags global variable name.
+pub static GLOBAL_CALL_FLAGS: &str = "call_flags";
+
 /// The deployer call header size that consists of:
 /// - bytecode hash (32 bytes)
 pub const DEPLOYER_CALL_HEADER_SIZE: usize = revive_common::BYTE_LENGTH_WORD;

crates/llvm-context/src/polkavm/context/address_space.rs

@@ -8,6 +8,10 @@ pub enum AddressSpace {
     Stack,
     /// The heap memory.
     Heap,
+    /// The generic memory page.
+    Storage,
+    /// The transient storage.
+    TransientStorage,
 }
 
 impl From<AddressSpace> for inkwell::AddressSpace {
@@ -15,6 +19,8 @@ impl From<AddressSpace> for inkwell::AddressSpace {
         match value {
             AddressSpace::Stack => Self::from(0),
             AddressSpace::Heap => Self::from(1),
+            AddressSpace::Storage => Self::from(5),
+            AddressSpace::TransientStorage => Self::from(6),
         }
     }
 }

crates/llvm-context/src/polkavm/context/evmla_data.rs

@@ -0,0 +1,27 @@
+//! The LLVM IR generator EVM legacy assembly data.
+
+use crate::polkavm::context::argument::Argument;
+
+/// The LLVM IR generator EVM legacy assembly data.
+/// Describes some data that is only relevant to the EVM legacy assembly.
+#[derive(Debug, Clone)]
+pub struct EVMLAData<'ctx> {
+    /// The Solidity compiler version.
+    /// Some instruction behave differenly depending on the version.
+    pub version: semver::Version,
+    /// The static stack allocated for the current function.
+    pub stack: Vec<Argument<'ctx>>,
+}
+
+impl EVMLAData<'_> {
+    /// The default stack size.
+    pub const DEFAULT_STACK_SIZE: usize = 64;
+
+    /// A shortcut constructor.
+    pub fn new(version: semver::Version) -> Self {
+        Self {
+            version,
+            stack: Vec::with_capacity(Self::DEFAULT_STACK_SIZE),
+        }
+    }
+}

crates/llvm-context/src/polkavm/context/function/block/evmla_data/key.rs

@@ -0,0 +1,34 @@
+//! The LLVM IR generator function block key.
+
+use crate::polkavm::context::code_type::CodeType;
+
+/// The LLVM IR generator function block key.
+/// Is only relevant to the EVM legacy assembly.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct Key {
+    /// The block code type.
+    pub code_type: CodeType,
+    /// The block tag.
+    pub tag: num::BigUint,
+}
+
+impl Key {
+    /// A shortcut constructor.
+    pub fn new(code_type: CodeType, tag: num::BigUint) -> Self {
+        Self { code_type, tag }
+    }
+}
+
+impl std::fmt::Display for Key {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}_{}",
+            match self.code_type {
+                CodeType::Deploy => "dt",
+                CodeType::Runtime => "rt",
+            },
+            self.tag
+        )
+    }
+}

crates/llvm-context/src/polkavm/context/function/block/evmla_data/mod.rs

@@ -0,0 +1,18 @@
+//! The LLVM function block EVM legacy assembly data.
+
+pub mod key;
+
+/// The LLVM function block EVM legacy assembly data.
+/// Describes some data that is only relevant to the EVM legacy assembly.
+#[derive(Debug, Clone)]
+pub struct EVMLAData {
+    /// The initial hashes of the allowed stack states.
+    pub stack_hashes: Vec<md5::Digest>,
+}
+
+impl EVMLAData {
+    /// A shortcut constructor.
+    pub fn new(stack_hashes: Vec<md5::Digest>) -> Self {
+        Self { stack_hashes }
+    }
+}

crates/llvm-context/src/polkavm/context/function/block/mod.rs

@@ -0,0 +1,52 @@
+//! The LLVM IR generator function block.
+
+pub mod evmla_data;
+
+use self::evmla_data::EVMLAData;
+
+/// The LLVM IR generator function block.
+#[derive(Debug, Clone)]
+pub struct Block<'ctx> {
+    /// The inner block.
+    inner: inkwell::basic_block::BasicBlock<'ctx>,
+    /// The EVM legacy assembly compiler data.
+    evmla_data: Option<EVMLAData>,
+}
+
+impl<'ctx> Block<'ctx> {
+    /// A shortcut constructor.
+    pub fn new(inner: inkwell::basic_block::BasicBlock<'ctx>) -> Self {
+        Self {
+            inner,
+            evmla_data: None,
+        }
+    }
+
+    /// Sets the EVM legacy assembly data.
+    pub fn set_evmla_data(&mut self, data: EVMLAData) {
+        self.evmla_data = Some(data);
+    }
+
+    /// The LLVM object reference.
+    pub fn inner(&self) -> inkwell::basic_block::BasicBlock<'ctx> {
+        self.inner
+    }
+
+    /// Returns the EVM data reference.
+    /// # Panics
+    /// If the EVM data has not been initialized.
+    pub fn evm(&self) -> &EVMLAData {
+        self.evmla_data
+            .as_ref()
+            .expect("The EVM data must have been initialized")
+    }
+
+    /// Returns the EVM data mutable reference.
+    /// # Panics
+    /// If the EVM data has not been initialized.
+    pub fn evm_mut(&mut self) -> &mut EVMLAData {
+        self.evmla_data
+            .as_mut()
+            .expect("The EVM data must have been initialized")
+    }
+}

crates/llvm-context/src/polkavm/context/function/evmla_data.rs

@@ -0,0 +1,74 @@
+//! The LLVM function EVM legacy assembly data.
+
+use std::collections::BTreeMap;
+
+use crate::polkavm::context::function::block::evmla_data::key::Key as BlockKey;
+use crate::polkavm::context::function::block::Block;
+
+/// The LLVM function EVM legacy assembly data.
+/// Describes some data that is only relevant to the EVM legacy assembly.
+#[derive(Debug)]
+pub struct EVMLAData<'ctx> {
+    /// The ordinary blocks with numeric tags.
+    /// Is only used by the Solidity EVM compiler.
+    pub blocks: BTreeMap<BlockKey, Vec<Block<'ctx>>>,
+    /// The function stack size.
+    pub stack_size: usize,
+}
+
+impl<'ctx> EVMLAData<'ctx> {
+    /// A shortcut constructor.
+    pub fn new(stack_size: usize) -> Self {
+        Self {
+            blocks: BTreeMap::new(),
+            stack_size,
+        }
+    }
+
+    /// Inserts a function block.
+    pub fn insert_block(&mut self, key: BlockKey, block: Block<'ctx>) {
+        if let Some(blocks) = self.blocks.get_mut(&key) {
+            blocks.push(block);
+        } else {
+            self.blocks.insert(key, vec![block]);
+        }
+    }
+
+    /// Returns the block with the specified tag and initial stack pattern.
+    /// If there is only one block, it is returned unconditionally.
+    pub fn find_block(
+        &self,
+        key: &BlockKey,
+        stack_hash: &md5::Digest,
+    ) -> anyhow::Result<Block<'ctx>> {
+        if self
+            .blocks
+            .get(key)
+            .ok_or_else(|| anyhow::anyhow!("Undeclared function block {}", key))?
+            .len()
+            == 1
+        {
+            return self
+                .blocks
+                .get(key)
+                .ok_or_else(|| anyhow::anyhow!("Undeclared function block {}", key))?
+                .first()
+                .cloned()
+                .ok_or_else(|| anyhow::anyhow!("Undeclared function block {}", key));
+        }
+
+        self.blocks
+            .get(key)
+            .ok_or_else(|| anyhow::anyhow!("Undeclared function block {}", key))?
+            .iter()
+            .find(|block| {
+                block
+                    .evm()
+                    .stack_hashes
+                    .iter()
+                    .any(|hash| hash == stack_hash)
+            })
+            .cloned()
+            .ok_or_else(|| anyhow::anyhow!("Undeclared function block {}", key))
+    }
+}

crates/llvm-context/src/polkavm/context/function/llvm_runtime.rs

@@ -1,6 +1,9 @@
 //! The LLVM runtime functions.
 
+use inkwell::types::BasicType;
+
 use crate::optimizer::Optimizer;
+use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::declaration::Declaration as FunctionDeclaration;
 use crate::polkavm::context::function::Function;
 
@@ -16,6 +19,9 @@ pub struct LLVMRuntime<'ctx> {
     pub exp: FunctionDeclaration<'ctx>,
     /// The corresponding LLVM runtime function.
     pub sign_extend: FunctionDeclaration<'ctx>,
+
+    /// The corresponding LLVM runtime function.
+    pub sha3: FunctionDeclaration<'ctx>,
 }
 
 impl<'ctx> LLVMRuntime<'ctx> {
@@ -31,6 +37,9 @@ impl<'ctx> LLVMRuntime<'ctx> {
     /// The corresponding runtime function name.
     pub const FUNCTION_SIGNEXTEND: &'static str = "__signextend";
 
+    /// The corresponding runtime function name.
+    pub const FUNCTION_SHA3: &'static str = "__sha3";
+
     /// A shortcut constructor.
     pub fn new(
         llvm: &'ctx inkwell::context::Context,
@@ -56,11 +65,43 @@ impl<'ctx> LLVMRuntime<'ctx> {
         Function::set_default_attributes(llvm, sign_extend, optimizer);
         Function::set_pure_function_attributes(llvm, sign_extend);
 
+        let sha3 = Self::declare(
+            module,
+            Self::FUNCTION_SHA3,
+            llvm.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
+                .fn_type(
+                    vec![
+                        llvm.ptr_type(AddressSpace::Heap.into())
+                            .as_basic_type_enum()
+                            .into(),
+                        llvm.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
+                            .as_basic_type_enum()
+                            .into(),
+                        llvm.custom_width_int_type(revive_common::BIT_LENGTH_BOOLEAN as u32)
+                            .as_basic_type_enum()
+                            .into(),
+                    ]
+                    .as_slice(),
+                    false,
+                ),
+            Some(inkwell::module::Linkage::External),
+        );
+        Function::set_default_attributes(llvm, sha3, optimizer);
+        Function::set_attributes(
+            llvm,
+            sha3,
+            //vec![Attribute::ArgMemOnly, Attribute::ReadOnly],
+            vec![],
+            false,
+        );
+
         Self {
             add_mod,
             mul_mod,
             exp,
             sign_extend,
+
+            sha3,
         }
     }
 

crates/llvm-context/src/polkavm/context/function/mod.rs

@@ -1,6 +1,8 @@
 //! The LLVM IR generator function.
 
+pub mod block;
 pub mod declaration;
+pub mod evmla_data;
 pub mod intrinsics;
 pub mod llvm_runtime;
 pub mod r#return;
@@ -17,6 +19,7 @@ use crate::polkavm::context::attribute::Attribute;
 use crate::polkavm::context::pointer::Pointer;
 
 use self::declaration::Declaration;
+use self::evmla_data::EVMLAData;
 use self::r#return::Return;
 use self::yul_data::YulData;
 
@@ -42,6 +45,8 @@ pub struct Function<'ctx> {
 
     /// The Yul compiler data.
     yul_data: Option<YulData>,
+    /// The EVM legacy assembly compiler data.
+    evmla_data: Option<EVMLAData<'ctx>>,
 }
 
 impl<'ctx> Function<'ctx> {
@@ -67,6 +72,7 @@ impl<'ctx> Function<'ctx> {
             return_block,
 
             yul_data: None,
+            evmla_data: None,
         }
     }
 
@@ -81,7 +87,8 @@ impl<'ctx> Function<'ctx> {
             || (name.starts_with("__")
                 && name != self::runtime::FUNCTION_ENTRY
                 && name != self::runtime::FUNCTION_DEPLOY_CODE
-                && name != self::runtime::FUNCTION_RUNTIME_CODE)
+                && name != self::runtime::FUNCTION_RUNTIME_CODE
+                && name != self::runtime::FUNCTION_LOAD_IMMUTABLE_DATA)
     }
 
     /// Returns the LLVM function declaration.
@@ -109,21 +116,30 @@ impl<'ctx> Function<'ctx> {
     pub fn set_attributes(
         llvm: &'ctx inkwell::context::Context,
         declaration: Declaration<'ctx>,
-        attributes: &[Attribute],
+        attributes: Vec<Attribute>,
         force: bool,
     ) {
-        for attribute_kind in attributes {
+        for attribute_kind in attributes.into_iter() {
             match attribute_kind {
                 Attribute::Memory => unimplemented!("`memory` attributes are not implemented"),
                 attribute_kind @ Attribute::AlwaysInline if force => {
-                    declaration.value.remove_enum_attribute(
-                        inkwell::attributes::AttributeLoc::Function,
-                        Attribute::NoInline as u32,
-                    );
-                    declaration.value.add_attribute(
-                        inkwell::attributes::AttributeLoc::Function,
-                        llvm.create_enum_attribute(*attribute_kind as u32, 0),
-                    );
+                    let is_optimize_none_set = declaration
+                        .value
+                        .get_enum_attribute(
+                            inkwell::attributes::AttributeLoc::Function,
+                            Attribute::OptimizeNone as u32,
+                        )
+                        .is_some();
+                    if !is_optimize_none_set {
+                        declaration.value.remove_enum_attribute(
+                            inkwell::attributes::AttributeLoc::Function,
+                            Attribute::NoInline as u32,
+                        );
+                        declaration.value.add_attribute(
+                            inkwell::attributes::AttributeLoc::Function,
+                            llvm.create_enum_attribute(attribute_kind as u32, 0),
+                        );
+                    }
                 }
                 attribute_kind @ Attribute::NoInline if force => {
                     declaration.value.remove_enum_attribute(
@@ -132,12 +148,12 @@ impl<'ctx> Function<'ctx> {
                     );
                     declaration.value.add_attribute(
                         inkwell::attributes::AttributeLoc::Function,
-                        llvm.create_enum_attribute(*attribute_kind as u32, 0),
+                        llvm.create_enum_attribute(attribute_kind as u32, 0),
                     );
                 }
                 attribute_kind => declaration.value.add_attribute(
                     inkwell::attributes::AttributeLoc::Function,
-                    llvm.create_enum_attribute(*attribute_kind as u32, 0),
+                    llvm.create_enum_attribute(attribute_kind as u32, 0),
                 ),
             }
         }
@@ -168,16 +184,27 @@ impl<'ctx> Function<'ctx> {
         declaration: Declaration<'ctx>,
         optimizer: &Optimizer,
     ) {
-        if optimizer.settings().level_middle_end_size == SizeLevel::Z {
+        if optimizer.settings().level_middle_end == inkwell::OptimizationLevel::None {
+            Self::remove_attributes(
+                declaration,
+                &[Attribute::OptimizeForSize, Attribute::AlwaysInline],
+            );
             Self::set_attributes(
                 llvm,
                 declaration,
-                &[Attribute::OptimizeForSize, Attribute::MinSize],
+                vec![Attribute::OptimizeNone, Attribute::NoInline],
+                false,
+            );
+        } else if optimizer.settings().level_middle_end_size == SizeLevel::Z {
+            Self::set_attributes(
+                llvm,
+                declaration,
+                vec![Attribute::OptimizeForSize, Attribute::MinSize],
                 false,
             );
         }
 
-        Self::set_attributes(llvm, declaration, &[Attribute::NoFree], false);
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoFree], false);
     }
 
     /// Sets the front-end runtime attributes.
@@ -187,10 +214,26 @@ impl<'ctx> Function<'ctx> {
         optimizer: &Optimizer,
     ) {
         if optimizer.settings().level_middle_end_size == SizeLevel::Z {
-            Self::set_attributes(llvm, declaration, &[Attribute::NoInline], false);
+            Self::set_attributes(llvm, declaration, vec![Attribute::NoInline], false);
         }
     }
 
+    /// Sets the exception handler attributes.
+    pub fn set_exception_handler_attributes(
+        llvm: &'ctx inkwell::context::Context,
+        declaration: Declaration<'ctx>,
+    ) {
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoInline], false);
+    }
+
+    /// Sets the CXA-throw attributes.
+    pub fn set_cxa_throw_attributes(
+        llvm: &'ctx inkwell::context::Context,
+        declaration: Declaration<'ctx>,
+    ) {
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoProfile], false);
+    }
+
     /// Sets the pure function attributes.
     pub fn set_pure_function_attributes(
         llvm: &'ctx inkwell::context::Context,
@@ -199,7 +242,7 @@ impl<'ctx> Function<'ctx> {
         Self::set_attributes(
             llvm,
             declaration,
-            &[
+            vec![
                 Attribute::MustProgress,
                 Attribute::NoUnwind,
                 Attribute::WillReturn,
@@ -257,6 +300,29 @@ impl<'ctx> Function<'ctx> {
         self.return_block
     }
 
+    /// Sets the EVM legacy assembly data.
+    pub fn set_evmla_data(&mut self, data: EVMLAData<'ctx>) {
+        self.evmla_data = Some(data);
+    }
+
+    /// Returns the EVM legacy assembly data reference.
+    /// # Panics
+    /// If the EVM data has not been initialized.
+    pub fn evmla(&self) -> &EVMLAData<'ctx> {
+        self.evmla_data
+            .as_ref()
+            .expect("The EVM data must have been initialized")
+    }
+
+    /// Returns the EVM legacy assembly data mutable reference.
+    /// # Panics
+    /// If the EVM data has not been initialized.
+    pub fn evmla_mut(&mut self) -> &mut EVMLAData<'ctx> {
+        self.evmla_data
+            .as_mut()
+            .expect("The EVM data must have been initialized")
+    }
+
     /// Sets the Yul data.
     pub fn set_yul_data(&mut self, data: YulData) {
         self.yul_data = Some(data);

crates/llvm-context/src/polkavm/context/function/runtime/arithmetics.rs

@@ -1,269 +0,0 @@
-//! Translates the arithmetic operations.
-
-use inkwell::values::BasicValue;
-
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Implements the division operator according to the EVM specification.
-pub struct Division;
-
-impl<D> RuntimeFunction<D> for Division
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_division";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let operand_1 = Self::paramater(context, 0).into_int_value();
-        let operand_2 = Self::paramater(context, 1).into_int_value();
-
-        wrapped_division(context, operand_2, || {
-            Ok(context
-                .builder()
-                .build_int_unsigned_div(operand_1, operand_2, "DIV")?)
-        })
-        .map(Into::into)
-    }
-}
-
-impl<D> WriteLLVM<D> for Division
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Implements the signed division operator according to the EVM specification.
-pub struct SignedDivision;
-
-impl<D> RuntimeFunction<D> for SignedDivision
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_signed_division";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let operand_1 = Self::paramater(context, 0).into_int_value();
-        let operand_2 = Self::paramater(context, 1).into_int_value();
-
-        let block_calculate = context.append_basic_block("calculate");
-        let block_overflow = context.append_basic_block("overflow");
-        let block_select = context.append_basic_block("select_result");
-        let block_origin = context.basic_block();
-        context.builder().build_switch(
-            operand_2,
-            block_calculate,
-            &[
-                (context.word_type().const_zero(), block_select),
-                (context.word_type().const_all_ones(), block_overflow),
-            ],
-        )?;
-
-        context.set_basic_block(block_calculate);
-        let quotient = context
-            .builder()
-            .build_int_signed_div(operand_1, operand_2, "SDIV")?;
-        context.build_unconditional_branch(block_select);
-
-        context.set_basic_block(block_overflow);
-        let max_uint = context.builder().build_int_z_extend(
-            context
-                .integer_type(revive_common::BIT_LENGTH_WORD - 1)
-                .const_all_ones(),
-            context.word_type(),
-            "max_uint",
-        )?;
-        let is_operand_1_overflow = context.builder().build_int_compare(
-            inkwell::IntPredicate::EQ,
-            operand_1,
-            context.builder().build_int_neg(max_uint, "min_uint")?,
-            "is_operand_1_overflow",
-        )?;
-        context.build_conditional_branch(is_operand_1_overflow, block_select, block_calculate)?;
-
-        context.set_basic_block(block_select);
-        let result = context.builder().build_phi(context.word_type(), "result")?;
-        result.add_incoming(&[
-            (&operand_1, block_overflow),
-            (&context.word_const(0), block_origin),
-            (&quotient.as_basic_value_enum(), block_calculate),
-        ]);
-        Ok(Some(result.as_basic_value()))
-    }
-}
-
-impl<D> WriteLLVM<D> for SignedDivision
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Implements the remainder operator according to the EVM specification.
-pub struct Remainder;
-
-impl<D> RuntimeFunction<D> for Remainder
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_remainder";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let operand_1 = Self::paramater(context, 0).into_int_value();
-        let operand_2 = Self::paramater(context, 1).into_int_value();
-
-        wrapped_division(context, operand_2, || {
-            Ok(context
-                .builder()
-                .build_int_unsigned_rem(operand_1, operand_2, "MOD")?)
-        })
-        .map(Into::into)
-    }
-}
-
-impl<D> WriteLLVM<D> for Remainder
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Implements the signed remainder operator according to the EVM specification.
-pub struct SignedRemainder;
-
-impl<D> RuntimeFunction<D> for SignedRemainder
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_signed_remainder";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let operand_1 = Self::paramater(context, 0).into_int_value();
-        let operand_2 = Self::paramater(context, 1).into_int_value();
-
-        wrapped_division(context, operand_2, || {
-            Ok(context
-                .builder()
-                .build_int_signed_rem(operand_1, operand_2, "SMOD")?)
-        })
-        .map(Into::into)
-    }
-}
-
-impl<D> WriteLLVM<D> for SignedRemainder
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Wrap division operations so that zero will be returned if the
-/// denominator is zero (see also Ethereum YP Appendix H.2).
-///
-/// The closure is expected to calculate and return the quotient.
-///
-/// The result is either the calculated quotient or zero,
-///  selected at runtime.
-fn wrapped_division<'ctx, D, F, T>(
-    context: &Context<'ctx, D>,
-    denominator: inkwell::values::IntValue<'ctx>,
-    f: F,
-) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
-where
-    D: Dependency + Clone,
-    F: FnOnce() -> anyhow::Result<T>,
-    T: inkwell::values::IntMathValue<'ctx>,
-{
-    assert_eq!(
-        denominator.get_type().get_bit_width(),
-        revive_common::BIT_LENGTH_WORD as u32
-    );
-
-    let block_calculate = context.append_basic_block("calculate");
-    let block_select = context.append_basic_block("select");
-    let block_origin = context.basic_block();
-    context.builder().build_switch(
-        denominator,
-        block_calculate,
-        &[(context.word_const(0), block_select)],
-    )?;
-
-    context.set_basic_block(block_calculate);
-    let calculated_value = f()?.as_basic_value_enum();
-    context.build_unconditional_branch(block_select);
-
-    context.set_basic_block(block_select);
-    let result = context.builder().build_phi(context.word_type(), "result")?;
-    result.add_incoming(&[
-        (&context.word_const(0), block_origin),
-        (&calculated_value, block_calculate),
-    ]);
-    Ok(result.as_basic_value())
-}

crates/llvm-context/src/polkavm/context/function/runtime/entry.rs

@@ -24,6 +24,22 @@ impl Entry {
     where
         D: Dependency + Clone,
     {
+        context.set_global(
+            crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER,
+            context.llvm().ptr_type(AddressSpace::Heap.into()),
+            AddressSpace::Stack,
+            context.xlen_type().get_undef(),
+        );
+        context.build_store(
+            context
+                .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
+                .into(),
+            context.build_sbrk(
+                context.xlen_type().const_zero(),
+                context.xlen_type().const_zero(),
+            )?,
+        )?;
+
         context.set_global(
             crate::polkavm::GLOBAL_CALLDATA_SIZE,
             context.xlen_type(),
@@ -31,6 +47,13 @@ impl Entry {
             context.xlen_type().get_undef(),
         );
 
+        context.set_global(
+            crate::polkavm::GLOBAL_CALL_FLAGS,
+            context.word_type(),
+            AddressSpace::Stack,
+            context.word_const(0),
+        );
+
         Ok(())
     }
 
@@ -47,11 +70,6 @@ impl Entry {
             .build_runtime_call(revive_runtime_api::polkavm_imports::CALL_DATA_SIZE, &[])
             .expect("the call_data_size syscall method should return a value")
             .into_int_value();
-        let call_data_size_value = context.builder().build_int_truncate(
-            call_data_size_value,
-            context.xlen_type(),
-            "call_data_size_truncated",
-        )?;
         context
             .builder()
             .build_store(call_data_size_pointer, call_data_size_value)?;
@@ -72,6 +90,13 @@ impl Entry {
             .borrow()
             .get_nth_param(Self::ARGUMENT_INDEX_CALL_FLAGS);
 
+        context.set_global(
+            crate::polkavm::GLOBAL_CALL_FLAGS,
+            is_deploy.get_type(),
+            AddressSpace::Stack,
+            is_deploy.into_int_value(),
+        );
+
         let deploy_code_call_block = context.append_basic_block("deploy_code_call_block");
         let runtime_code_call_block = context.append_basic_block("runtime_code_call_block");
 
@@ -145,7 +170,7 @@ where
         crate::PolkaVMFunction::set_attributes(
             context.llvm(),
             entry,
-            &[crate::PolkaVMAttribute::NoReturn],
+            vec![crate::PolkaVMAttribute::NoReturn],
             true,
         );
 

crates/llvm-context/src/polkavm/context/function/runtime/immutable_data_load.rs

@@ -0,0 +1,118 @@
+//! The immutable data runtime function.
+
+use crate::polkavm::context::address_space::AddressSpace;
+use crate::polkavm::context::function::runtime;
+use crate::polkavm::context::pointer::Pointer;
+use crate::polkavm::context::Context;
+use crate::polkavm::Dependency;
+use crate::polkavm::WriteLLVM;
+
+/// A function for requesting the immutable data from the runtime.
+/// This is a special function that is only used by the front-end generated code.
+///
+/// The runtime API is called lazily and subsequent calls are no-ops.
+///
+/// The bytes written is asserted to match the expected length.
+/// This should never fail; the length is known.
+/// However, this is a one time assertion, hence worth it.
+#[derive(Debug)]
+pub struct ImmutableDataLoad;
+
+impl<D> WriteLLVM<D> for ImmutableDataLoad
+where
+    D: Dependency + Clone,
+{
+    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
+        context.add_function(
+            runtime::FUNCTION_LOAD_IMMUTABLE_DATA,
+            context.void_type().fn_type(Default::default(), false),
+            0,
+            Some(inkwell::module::Linkage::External),
+        )?;
+
+        Ok(())
+    }
+
+    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
+        context.set_current_function(runtime::FUNCTION_LOAD_IMMUTABLE_DATA, None)?;
+        context.set_basic_block(context.current_function().borrow().entry_block());
+
+        let immutable_data_size_pointer = context
+            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
+            .value
+            .as_pointer_value();
+        let immutable_data_size = context.build_load(
+            Pointer::new(
+                context.xlen_type(),
+                AddressSpace::Stack,
+                immutable_data_size_pointer,
+            ),
+            "immutable_data_size_load",
+        )?;
+
+        let load_immutable_data_block = context.append_basic_block("load_immutables_block");
+        let return_block = context.current_function().borrow().return_block();
+        let immutable_data_size_is_zero = context.builder().build_int_compare(
+            inkwell::IntPredicate::EQ,
+            context.xlen_type().const_zero(),
+            immutable_data_size.into_int_value(),
+            "immutable_data_size_is_zero",
+        )?;
+        context.build_conditional_branch(
+            immutable_data_size_is_zero,
+            return_block,
+            load_immutable_data_block,
+        )?;
+
+        context.set_basic_block(load_immutable_data_block);
+        let output_pointer = context
+            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
+            .value
+            .as_pointer_value();
+        context.build_runtime_call(
+            revive_runtime_api::polkavm_imports::GET_IMMUTABLE_DATA,
+            &[
+                context
+                    .builder()
+                    .build_ptr_to_int(output_pointer, context.xlen_type(), "ptr_to_xlen")?
+                    .into(),
+                context
+                    .builder()
+                    .build_ptr_to_int(
+                        immutable_data_size_pointer,
+                        context.xlen_type(),
+                        "ptr_to_xlen",
+                    )?
+                    .into(),
+            ],
+        );
+        let bytes_written = context.builder().build_load(
+            context.xlen_type(),
+            immutable_data_size_pointer,
+            "bytes_written",
+        )?;
+        context.builder().build_store(
+            immutable_data_size_pointer,
+            context.xlen_type().const_zero(),
+        )?;
+        let overflow_block = context.append_basic_block("immutable_data_overflow");
+        let is_overflow = context.builder().build_int_compare(
+            inkwell::IntPredicate::UGT,
+            immutable_data_size.into_int_value(),
+            bytes_written.into_int_value(),
+            "is_overflow",
+        )?;
+        context.build_conditional_branch(is_overflow, overflow_block, return_block)?;
+
+        context.set_basic_block(overflow_block);
+        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
+        context.build_unreachable();
+
+        context.set_basic_block(return_block);
+        context.build_return(None);
+
+        context.pop_debug_scope();
+
+        Ok(())
+    }
+}

crates/llvm-context/src/polkavm/context/function/runtime/mod.rs

@@ -1,9 +1,8 @@
 //! The front-end runtime functions.
 
-pub mod arithmetics;
 pub mod deploy_code;
 pub mod entry;
-pub mod revive;
+pub mod immutable_data_load;
 pub mod runtime_code;
 
 /// The main entry function name.
@@ -14,3 +13,6 @@ pub const FUNCTION_DEPLOY_CODE: &str = "__deploy";
 
 /// The runtime code function name.
 pub const FUNCTION_RUNTIME_CODE: &str = "__runtime";
+
+/// The immutable data load function name.
+pub const FUNCTION_LOAD_IMMUTABLE_DATA: &str = "__immutable_data_load";

crates/llvm-context/src/polkavm/context/function/runtime/revive.rs

@@ -1,147 +0,0 @@
-//! The revive compiler runtime functions.
-
-use inkwell::values::BasicValue;
-
-use crate::polkavm::context::function::Attribute;
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Pointers are represented as opaque 256 bit integer values in EVM.
-/// In practice, they should never exceed a register sized bit value.
-/// However, we still protect against this possibility here: Heap index
-/// offsets are generally untrusted and potentially represent valid
-/// (but wrong) pointers when truncated.
-pub struct WordToPointer;
-
-impl<D> RuntimeFunction<D> for WordToPointer
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_int_truncate";
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::WillReturn,
-        Attribute::NoFree,
-        Attribute::AlwaysInline,
-    ];
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .xlen_type()
-            .fn_type(&[context.word_type().into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let value = Self::paramater(context, 0).into_int_value();
-        let truncated =
-            context
-                .builder()
-                .build_int_truncate(value, context.xlen_type(), "offset_truncated")?;
-        let extended = context.builder().build_int_z_extend(
-            truncated,
-            context.word_type(),
-            "offset_extended",
-        )?;
-        let is_overflow = context.builder().build_int_compare(
-            inkwell::IntPredicate::NE,
-            value,
-            extended,
-            "compare_truncated_extended",
-        )?;
-
-        let block_continue = context.append_basic_block("offset_pointer_ok");
-        let block_trap = context.append_basic_block("offset_pointer_overflow");
-        context.build_conditional_branch(is_overflow, block_trap, block_continue)?;
-
-        context.set_basic_block(block_trap);
-        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
-        context.build_unreachable();
-
-        context.set_basic_block(block_continue);
-        Ok(Some(truncated.as_basic_value_enum()))
-    }
-}
-
-impl<D> WriteLLVM<D> for WordToPointer
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// The revive runtime exit function.
-pub struct Exit;
-
-impl<D> RuntimeFunction<D> for Exit
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_exit";
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::NoReturn,
-        Attribute::NoFree,
-        Attribute::AlwaysInline,
-    ];
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[
-                context.xlen_type().into(),
-                context.word_type().into(),
-                context.word_type().into(),
-            ],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let flags = Self::paramater(context, 0).into_int_value();
-        let offset = Self::paramater(context, 1).into_int_value();
-        let length = Self::paramater(context, 2).into_int_value();
-
-        let offset_truncated = context.safe_truncate_int_to_xlen(offset)?;
-        let length_truncated = context.safe_truncate_int_to_xlen(length)?;
-        let heap_pointer = context.build_heap_gep(offset_truncated, length_truncated)?;
-        let offset_pointer = context.builder().build_ptr_to_int(
-            heap_pointer.value,
-            context.xlen_type(),
-            "return_data_ptr_to_int",
-        )?;
-
-        context.build_runtime_call(
-            revive_runtime_api::polkavm_imports::RETURN,
-            &[flags.into(), offset_pointer.into(), length_truncated.into()],
-        );
-        context.build_unreachable();
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for Exit
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}

crates/llvm-context/src/polkavm/context/mod.rs

@@ -6,11 +6,11 @@ pub mod attribute;
 pub mod build;
 pub mod code_type;
 pub mod debug_info;
+pub mod evmla_data;
 pub mod function;
 pub mod global;
 pub mod r#loop;
 pub mod pointer;
-pub mod runtime;
 pub mod solidity_data;
 pub mod yul_data;
 
@@ -32,25 +32,21 @@ use crate::polkavm::DebugConfig;
 use crate::polkavm::Dependency;
 use crate::target_machine::target::Target;
 use crate::target_machine::TargetMachine;
-use crate::PolkaVMLoadHeapWordFunction;
-use crate::PolkaVMStoreHeapWordFunction;
 
 use self::address_space::AddressSpace;
 use self::attribute::Attribute;
 use self::build::Build;
 use self::code_type::CodeType;
 use self::debug_info::DebugInfo;
+use self::evmla_data::EVMLAData;
 use self::function::declaration::Declaration as FunctionDeclaration;
 use self::function::intrinsics::Intrinsics;
 use self::function::llvm_runtime::LLVMRuntime;
 use self::function::r#return::Return as FunctionReturn;
-use self::function::runtime::revive::Exit;
-use self::function::runtime::revive::WordToPointer;
 use self::function::Function;
 use self::global::Global;
 use self::pointer::Pointer;
 use self::r#loop::Loop;
-use self::runtime::RuntimeFunction;
 use self::solidity_data::SolidityData;
 use self::yul_data::YulData;
 
@@ -83,8 +79,6 @@ where
     current_function: Option<Rc<RefCell<Function<'ctx>>>>,
     /// The loop context stack.
     loop_stack: Vec<Loop<'ctx>>,
-    /// The extra LLVM arguments that were used during target initialization.
-    llvm_arguments: &'ctx [String],
 
     /// The project dependency manager. It can be any entity implementing the trait.
     /// The manager is used to get information about contracts and their dependencies during
@@ -101,6 +95,8 @@ where
     solidity_data: Option<SolidityData>,
     /// The Yul data.
     yul_data: Option<YulData>,
+    /// The EVM legacy assembly data.
+    evmla_data: Option<EVMLAData<'ctx>>,
 }
 
 impl<'ctx, D> Context<'ctx, D>
@@ -225,7 +221,6 @@ where
         dependency_manager: Option<D>,
         include_metadata_hash: bool,
         debug_config: DebugConfig,
-        llvm_arguments: &'ctx [String],
     ) -> Self {
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
@@ -253,7 +248,6 @@ where
             functions: HashMap::with_capacity(Self::FUNCTIONS_HASHMAP_INITIAL_CAPACITY),
             current_function: None,
             loop_stack: Vec::with_capacity(Self::LOOP_STACK_INITIAL_CAPACITY),
-            llvm_arguments,
 
             dependency_manager,
             include_metadata_hash,
@@ -263,6 +257,7 @@ where
 
             solidity_data: None,
             yul_data: None,
+            evmla_data: None,
         }
     }
 
@@ -643,7 +638,6 @@ where
                     self.optimizer.settings().to_owned(),
                     self.include_metadata_hash,
                     self.debug_config.clone(),
-                    self.llvm_arguments,
                 )
             })
     }
@@ -732,7 +726,6 @@ where
         name: &str,
     ) -> Pointer<'ctx> {
         let pointer = self.builder.build_alloca(r#type, name).unwrap();
-
         pointer
             .as_instruction()
             .unwrap()
@@ -780,18 +773,60 @@ where
     ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let name = <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::NAME;
-                let declaration =
-                    <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                let arguments = [self
+                let heap_pointer = self.build_heap_gep(
+                    self.builder().build_ptr_to_int(
+                        pointer.value,
+                        self.xlen_type(),
+                        "offset_ptrtoint",
+                    )?,
+                    pointer
+                        .r#type
+                        .size_of()
+                        .expect("should be IntValue")
+                        .const_truncate(self.xlen_type()),
+                )?;
+
+                let value = self
                     .builder()
-                    .build_ptr_to_int(pointer.value, self.xlen_type(), "offset_ptrtoint")?
-                    .as_basic_value_enum()];
-                Ok(self
-                    .build_call(declaration, &arguments, "heap_load")
-                    .unwrap_or_else(|| {
-                        panic!("revive runtime function {name} should return a value")
-                    }))
+                    .build_load(pointer.r#type, heap_pointer.value, name)?;
+                self.basic_block()
+                    .get_last_instruction()
+                    .expect("Always exists")
+                    .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
+                    .expect("Alignment is valid");
+
+                self.build_byte_swap(value)
+            }
+            AddressSpace::Storage | AddressSpace::TransientStorage => {
+                let storage_value_pointer =
+                    self.build_alloca(self.word_type(), "storage_value_pointer");
+                self.build_store(storage_value_pointer, self.word_const(0))?;
+
+                let storage_value_length_pointer =
+                    self.build_alloca(self.xlen_type(), "storage_value_length_pointer");
+                self.build_store(
+                    storage_value_length_pointer,
+                    self.word_const(revive_common::BIT_LENGTH_WORD as u64),
+                )?;
+
+                let transient = pointer.address_space == AddressSpace::TransientStorage;
+
+                self.build_runtime_call(
+                    revive_runtime_api::polkavm_imports::GET_STORAGE,
+                    &[
+                        self.xlen_type().const_int(transient as u64, false).into(),
+                        pointer.to_int(self).into(),
+                        self.xlen_type().const_all_ones().into(),
+                        storage_value_pointer.to_int(self).into(),
+                        storage_value_length_pointer.to_int(self).into(),
+                    ],
+                );
+
+                // We do not to check the return value.
+                // Solidity assumes infallible SLOAD.
+                // If a key doesn't exist the "zero" value is returned.
+
+                self.build_load(storage_value_pointer, "storage_value_load")
             }
             AddressSpace::Stack => {
                 let value = self
@@ -817,13 +852,60 @@ where
     {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let declaration =
-                    <PolkaVMStoreHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                let arguments = [
-                    pointer.to_int(self).as_basic_value_enum(),
-                    value.as_basic_value_enum(),
-                ];
-                self.build_call(declaration, &arguments, "heap_store");
+                let heap_pointer = self.build_heap_gep(
+                    self.builder().build_ptr_to_int(
+                        pointer.value,
+                        self.xlen_type(),
+                        "offset_ptrtoint",
+                    )?,
+                    value
+                        .as_basic_value_enum()
+                        .get_type()
+                        .size_of()
+                        .expect("should be IntValue")
+                        .const_truncate(self.xlen_type()),
+                )?;
+
+                let value = value.as_basic_value_enum();
+                let value = match value.get_type().into_int_type().get_bit_width() as usize {
+                    revive_common::BIT_LENGTH_WORD => self.build_byte_swap(value)?,
+                    revive_common::BIT_LENGTH_BYTE => value,
+                    _ => unreachable!("Only word and byte sized values can be stored on EVM heap"),
+                };
+
+                self.builder
+                    .build_store(heap_pointer.value, value)?
+                    .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
+                    .expect("Alignment is valid");
+            }
+            AddressSpace::Storage | AddressSpace::TransientStorage => {
+                assert_eq!(
+                    value.as_basic_value_enum().get_type(),
+                    self.word_type().as_basic_type_enum()
+                );
+
+                let storage_value_pointer = self.build_alloca(self.word_type(), "storage_value");
+                let storage_value_pointer_casted = self.builder().build_ptr_to_int(
+                    storage_value_pointer.value,
+                    self.xlen_type(),
+                    "storage_value_pointer_casted",
+                )?;
+
+                self.builder()
+                    .build_store(storage_value_pointer.value, value)?;
+
+                let transient = pointer.address_space == AddressSpace::TransientStorage;
+
+                self.build_runtime_call(
+                    revive_runtime_api::polkavm_imports::SET_STORAGE,
+                    &[
+                        self.xlen_type().const_int(transient as u64, false).into(),
+                        pointer.to_int(self).into(),
+                        self.xlen_type().const_all_ones().into(),
+                        storage_value_pointer_casted.into(),
+                        self.integer_const(crate::polkavm::XLEN, 32).into(),
+                    ],
+                );
             }
             AddressSpace::Stack => {
                 let instruction = self.builder.build_store(pointer.value, value).unwrap();
@@ -869,6 +951,9 @@ where
     where
         T: BasicType<'ctx>,
     {
+        assert_ne!(pointer.address_space, AddressSpace::Storage);
+        assert_ne!(pointer.address_space, AddressSpace::TransientStorage);
+
         let value = unsafe {
             self.builder
                 .build_gep(pointer.r#type, pointer.value, indexes, name)
@@ -1035,16 +1120,38 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         length: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<()> {
-        self.build_call(
-            <Exit as RuntimeFunction<D>>::declaration(self),
-            &[flags.into(), offset.into(), length.into()],
-            "exit",
+        let offset_truncated = self.safe_truncate_int_to_xlen(offset)?;
+        let length_truncated = self.safe_truncate_int_to_xlen(length)?;
+        let offset_into_heap = self.build_heap_gep(offset_truncated, length_truncated)?;
+
+        let length_pointer = self.safe_truncate_int_to_xlen(length)?;
+        let offset_pointer = self.builder().build_ptr_to_int(
+            offset_into_heap.value,
+            self.xlen_type(),
+            "return_data_ptr_to_int",
+        )?;
+
+        self.build_runtime_call(
+            revive_runtime_api::polkavm_imports::RETURN,
+            &[flags.into(), offset_pointer.into(), length_pointer.into()],
         );
+        self.build_unreachable();
 
         Ok(())
     }
 
     /// Truncate a memory offset to register size, trapping if it doesn't fit.
+    /// Pointers are represented as opaque 256 bit integer values in EVM.
+    /// In practice, they should never exceed a register sized bit value.
+    /// However, we still protect against this possibility here. Heap index
+    /// offsets are generally untrusted and potentially represent valid
+    /// (but wrong) pointers when truncated.
+    ///
+    /// TODO: Splitting up into a dedicated function
+    /// could potentially decrease code sizes (LLVM can still decide to inline).
+    /// However, passing i256 parameters is counter productive and
+    /// I've found that splitting it up actualy increases code size.
+    /// Should be reviewed after 64bit support.
     pub fn safe_truncate_int_to_xlen(
         &self,
         value: inkwell::values::IntValue<'ctx>,
@@ -1058,19 +1165,29 @@ where
             "expected XLEN or WORD sized int type for memory offset",
         );
 
-        Ok(self
-            .build_call(
-                <WordToPointer as RuntimeFunction<D>>::declaration(self),
-                &[value.into()],
-                "word_to_pointer",
-            )
-            .unwrap_or_else(|| {
-                panic!(
-                    "revive runtime function {} should return a value",
-                    <WordToPointer as RuntimeFunction<D>>::NAME,
-                )
-            })
-            .into_int_value())
+        let truncated =
+            self.builder()
+                .build_int_truncate(value, self.xlen_type(), "offset_truncated")?;
+        let extended =
+            self.builder()
+                .build_int_z_extend(truncated, self.word_type(), "offset_extended")?;
+        let is_overflow = self.builder().build_int_compare(
+            inkwell::IntPredicate::NE,
+            value,
+            extended,
+            "compare_truncated_extended",
+        )?;
+
+        let block_continue = self.append_basic_block("offset_pointer_ok");
+        let block_trap = self.append_basic_block("offset_pointer_overflow");
+        self.build_conditional_branch(is_overflow, block_trap, block_continue)?;
+
+        self.set_basic_block(block_trap);
+        self.build_call(self.intrinsics().trap, &[], "invalid_trap");
+        self.build_unreachable();
+
+        self.set_basic_block(block_continue);
+        Ok(truncated)
     }
 
     /// Build a call to PolkaVM `sbrk` for extending the heap from offset by `size`.
@@ -1097,17 +1214,45 @@ where
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
-        let memory_size_pointer = self
-            .module()
-            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
-            .expect("the memory size symbol should have been declared")
-            .as_pointer_value();
-        let memory_size_value = self.builder().build_load(
-            self.xlen_type(),
-            memory_size_pointer,
-            "memory_size_value",
+        Ok(self
+            .builder()
+            .build_call(
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::MEMORY_SIZE),
+                &[],
+                "call_msize",
+            )?
+            .try_as_basic_value()
+            .left()
+            .expect("sbrk returns an int")
+            .into_int_value())
+    }
+
+    /// Call PolkaVM `sbrk` for extending the heap by `offset` + `size`,
+    /// trapping the contract if the call failed.
+    pub fn build_heap_alloc(
+        &self,
+        offset: inkwell::values::IntValue<'ctx>,
+        size: inkwell::values::IntValue<'ctx>,
+    ) -> anyhow::Result<()> {
+        let end_of_memory = self.build_sbrk(offset, size)?;
+        let return_is_nil = self.builder().build_int_compare(
+            inkwell::IntPredicate::EQ,
+            end_of_memory,
+            self.llvm().ptr_type(Default::default()).const_null(),
+            "compare_end_of_memory_nil",
         )?;
-        Ok(memory_size_value.into_int_value())
+
+        let continue_block = self.append_basic_block("sbrk_not_nil");
+        let trap_block = self.append_basic_block("sbrk_nil");
+        self.build_conditional_branch(return_is_nil, trap_block, continue_block)?;
+
+        self.set_basic_block(trap_block);
+        self.build_call(self.intrinsics().trap, &[], "invalid_trap");
+        self.build_unreachable();
+
+        self.set_basic_block(continue_block);
+
+        Ok(())
     }
 
     /// Returns a pointer to `offset` into the heap, allocating
@@ -1122,8 +1267,18 @@ where
         assert_eq!(offset.get_type(), self.xlen_type());
         assert_eq!(length.get_type(), self.xlen_type());
 
-        let pointer = self.build_sbrk(offset, length)?;
-        Ok(Pointer::new(self.byte_type(), AddressSpace::Stack, pointer))
+        self.build_heap_alloc(offset, length)?;
+
+        let heap_start = self
+            .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
+            .value
+            .as_pointer_value();
+        Ok(self.build_gep(
+            Pointer::new(self.byte_type(), AddressSpace::Stack, heap_start),
+            &[offset],
+            self.byte_type(),
+            "heap_offset_via_gep",
+        ))
     }
 
     /// Returns a boolean type constant.
@@ -1184,17 +1339,11 @@ where
         self.llvm.custom_width_int_type(bit_length as u32)
     }
 
-    /// Returns the XLEN witdh sized type.
+    /// Returns the register witdh sized type.
     pub fn xlen_type(&self) -> inkwell::types::IntType<'ctx> {
         self.llvm.custom_width_int_type(crate::polkavm::XLEN as u32)
     }
 
-    /// Returns the PolkaVM native register width sized type.
-    pub fn register_type(&self) -> inkwell::types::IntType<'ctx> {
-        self.llvm
-            .custom_width_int_type(revive_common::BIT_LENGTH_X64 as u32)
-    }
-
     /// Returns the sentinel pointer value.
     pub fn sentinel_pointer(&self) -> Pointer<'ctx> {
         let sentinel_pointer = self
@@ -1294,6 +1443,13 @@ where
                     inkwell::attributes::AttributeLoc::Param(index as u32),
                     self.llvm.create_enum_attribute(Attribute::NoFree as u32, 0),
                 );
+                if function == self.llvm_runtime().sha3 {
+                    call_site_value.add_attribute(
+                        inkwell::attributes::AttributeLoc::Param(index as u32),
+                        self.llvm
+                            .create_enum_attribute(Attribute::ReadOnly as u32, 0),
+                    );
+                }
                 if Some(argument.get_type()) == function.r#type.get_return_type() {
                     if function
                         .r#type
@@ -1412,6 +1568,29 @@ where
             .expect("The Yul data must have been initialized")
     }
 
+    /// Sets the EVM legacy assembly data.
+    pub fn set_evmla_data(&mut self, data: EVMLAData<'ctx>) {
+        self.evmla_data = Some(data);
+    }
+
+    /// Returns the EVM legacy assembly data reference.
+    /// # Panics
+    /// If the EVM data has not been initialized.
+    pub fn evmla(&self) -> &EVMLAData<'ctx> {
+        self.evmla_data
+            .as_ref()
+            .expect("The EVMLA data must have been initialized")
+    }
+
+    /// Returns the EVM legacy assembly data mutable reference.
+    /// # Panics
+    /// If the EVM data has not been initialized.
+    pub fn evmla_mut(&mut self) -> &mut EVMLAData<'ctx> {
+        self.evmla_data
+            .as_mut()
+            .expect("The EVMLA data must have been initialized")
+    }
+
     /// Returns the current number of immutables values in the contract.
     /// If the size is set manually, then it is returned. Otherwise, the number of elements in
     /// the identifier-to-offset mapping tree is returned.
@@ -1422,8 +1601,4 @@ where
             anyhow::bail!("The immutable size data is not available");
         }
     }
-
-    pub fn optimizer_settings(&self) -> &OptimizerSettings {
-        self.optimizer.settings()
-    }
 }

crates/llvm-context/src/polkavm/context/pointer.rs

@@ -7,9 +7,6 @@ use crate::polkavm::context::global::Global;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
 
-pub mod heap;
-pub mod storage;
-
 /// The LLVM pointer.
 #[derive(Debug, Clone, Copy)]
 pub struct Pointer<'ctx> {

crates/llvm-context/src/polkavm/context/pointer/heap.rs

@@ -1,110 +0,0 @@
-//! The revive simulated EVM linear memory pointer functions.
-
-use inkwell::values::BasicValueEnum;
-
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Load a word size value from a heap pointer.
-pub struct LoadWord;
-
-impl<D> RuntimeFunction<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_heap_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .word_type()
-            .fn_type(&[context.xlen_type().into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        let offset = Self::paramater(context, 0).into_int_value();
-        let length = context
-            .xlen_type()
-            .const_int(revive_common::BYTE_LENGTH_WORD as u64, false);
-        let pointer = context.build_heap_gep(offset, length)?;
-        let value = context
-            .builder()
-            .build_load(context.word_type(), pointer.value, "value")?;
-        context
-            .basic_block()
-            .get_last_instruction()
-            .expect("Always exists")
-            .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
-            .expect("Alignment is valid");
-
-        let swapped_value = context.build_byte_swap(value)?;
-        Ok(Some(swapped_value))
-    }
-}
-
-impl<D> WriteLLVM<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Store a word size value through a heap pointer.
-pub struct StoreWord;
-
-impl<D> RuntimeFunction<D> for StoreWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_heap_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[context.xlen_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        let offset = Self::paramater(context, 0).into_int_value();
-        let length = context
-            .xlen_type()
-            .const_int(revive_common::BYTE_LENGTH_WORD as u64, false);
-        let pointer = context.build_heap_gep(offset, length)?;
-
-        let value = context.build_byte_swap(Self::paramater(context, 1))?;
-
-        context
-            .builder()
-            .build_store(pointer.value, value)?
-            .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
-            .expect("Alignment is valid");
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for StoreWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}

crates/llvm-context/src/polkavm/context/pointer/storage.rs

@@ -1,247 +0,0 @@
-//! The revive storage pointer functions.
-
-use inkwell::values::BasicValueEnum;
-
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Load a word size value from a storage pointer.
-pub struct LoadWord;
-
-impl<D> RuntimeFunction<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .word_type()
-            .fn_type(&[context.word_type().into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        Ok(Some(emit_load(
-            context,
-            Self::paramater(context, 0),
-            false,
-        )?))
-    }
-}
-
-impl<D> WriteLLVM<D> for LoadWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Load a word size value from a transient storage pointer.
-pub struct LoadTransientWord;
-
-impl<D> RuntimeFunction<D> for LoadTransientWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_transient_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .word_type()
-            .fn_type(&[context.word_type().into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        Ok(Some(emit_load(context, Self::paramater(context, 0), true)?))
-    }
-}
-
-impl<D> WriteLLVM<D> for LoadTransientWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Store a word size value through a storage pointer.
-pub struct StoreWord;
-
-impl<D> RuntimeFunction<D> for StoreWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        emit_store(
-            context,
-            Self::paramater(context, 0),
-            Self::paramater(context, 1),
-            false,
-        )?;
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for StoreWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Store a word size value through a transient storage pointer.
-pub struct StoreTransientWord;
-
-impl<D> RuntimeFunction<D> for StoreTransientWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_transient_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[context.word_type().into(), context.word_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        emit_store(
-            context,
-            Self::paramater(context, 0),
-            Self::paramater(context, 1),
-            true,
-        )?;
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for StoreTransientWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-fn emit_load<'ctx, D: Dependency + Clone>(
-    context: &mut Context<'ctx, D>,
-    mut key: BasicValueEnum<'ctx>,
-    transient: bool,
-) -> anyhow::Result<BasicValueEnum<'ctx>> {
-    if !transient {
-        key = context.build_byte_swap(key)?;
-    }
-
-    let key_pointer = context.build_alloca_at_entry(context.word_type(), "key_pointer");
-    let value_pointer = context.build_alloca_at_entry(context.word_type(), "value_pointer");
-    let length_pointer = context.build_alloca_at_entry(context.xlen_type(), "length_pointer");
-
-    context.builder().build_store(key_pointer.value, key)?;
-    context.build_store(value_pointer, context.word_const(0))?;
-    context.build_store(
-        length_pointer,
-        context
-            .xlen_type()
-            .const_int(revive_common::BYTE_LENGTH_WORD as u64, false),
-    )?;
-
-    let is_transient = context.xlen_type().const_int(transient as u64, false);
-
-    let arguments = [
-        is_transient.into(),
-        key_pointer.to_int(context).into(),
-        context.xlen_type().const_all_ones().into(),
-        value_pointer.to_int(context).into(),
-        length_pointer.to_int(context).into(),
-    ];
-    context.build_runtime_call(revive_runtime_api::polkavm_imports::GET_STORAGE, &arguments);
-
-    // We do not to check the return value: Solidity assumes infallible loads.
-    // If a key doesn't exist the "zero" value is returned (ensured by above write).
-
-    let value = context.build_load(value_pointer, "storage_value")?;
-    Ok(if transient {
-        value
-    } else {
-        context.build_byte_swap(value)?
-    })
-}
-
-fn emit_store<'ctx, D: Dependency + Clone>(
-    context: &mut Context<'ctx, D>,
-    mut key: BasicValueEnum<'ctx>,
-    mut value: BasicValueEnum<'ctx>,
-    transient: bool,
-) -> anyhow::Result<()> {
-    if !transient {
-        key = context.build_byte_swap(key)?;
-        value = context.build_byte_swap(value)?;
-    }
-
-    let key_pointer = context.build_alloca_at_entry(context.word_type(), "key_pointer");
-    let value_pointer = context.build_alloca_at_entry(context.word_type(), "value_pointer");
-
-    context.build_store(key_pointer, key)?;
-    context.build_store(value_pointer, value)?;
-
-    let is_transient = context.xlen_type().const_int(transient as u64, false);
-
-    let arguments = [
-        is_transient.into(),
-        key_pointer.to_int(context).into(),
-        context.xlen_type().const_all_ones().into(),
-        value_pointer.to_int(context).into(),
-        context.integer_const(crate::polkavm::XLEN, 32).into(),
-    ];
-    context.build_runtime_call(revive_runtime_api::polkavm_imports::SET_STORAGE, &arguments);
-
-    Ok(())
-}

crates/llvm-context/src/polkavm/context/runtime.rs

@@ -1,113 +0,0 @@
-//! The revive compiler runtime function interface definition.
-//!
-//! Common routines should not be inlined but extracted into smaller functions.
-//! This benefits contract code size.
-
-use crate::optimizer::settings::size_level::SizeLevel;
-use crate::polkavm::context::function::declaration::Declaration;
-use crate::polkavm::context::function::Function;
-use crate::polkavm::context::Attribute;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-
-/// The revive runtime function interface simplifies declaring runtime functions
-/// and code emitting by providing helpful default implementations.
-pub trait RuntimeFunction<D>
-where
-    D: Dependency + Clone,
-{
-    /// The function name.
-    const NAME: &'static str;
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::NoFree,
-        Attribute::NoRecurse,
-        Attribute::WillReturn,
-    ];
-
-    /// The function type.
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx>;
-
-    /// Declare the function.
-    fn declare(&self, context: &mut Context<D>) -> anyhow::Result<()> {
-        let function = context.add_function(
-            Self::NAME,
-            Self::r#type(context),
-            0,
-            Some(inkwell::module::Linkage::External),
-        )?;
-
-        let mut attributes = Self::ATTRIBUTES.to_vec();
-        attributes.extend_from_slice(match context.optimizer_settings().level_middle_end_size {
-            SizeLevel::Zero => &[],
-            _ => &[Attribute::OptimizeForSize, Attribute::MinSize],
-        });
-        Function::set_attributes(
-            context.llvm(),
-            function.borrow().declaration(),
-            &attributes,
-            true,
-        );
-
-        Ok(())
-    }
-
-    /// Get the function declaration.
-    fn declaration<'ctx>(context: &Context<'ctx, D>) -> Declaration<'ctx> {
-        context
-            .get_function(Self::NAME)
-            .unwrap_or_else(|| panic!("runtime function {} should be declared", Self::NAME))
-            .borrow()
-            .declaration()
-    }
-
-    /// Emit the function.
-    fn emit(&self, context: &mut Context<D>) -> anyhow::Result<()> {
-        context.set_current_function(Self::NAME, None)?;
-        context.set_basic_block(context.current_function().borrow().entry_block());
-
-        let return_value = self.emit_body(context)?;
-        self.emit_epilogue(context, return_value);
-
-        context.pop_debug_scope();
-
-        Ok(())
-    }
-
-    /// Emit the function body.
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>>;
-
-    /// Emit the function return instructions.
-    fn emit_epilogue<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-        return_value: Option<inkwell::values::BasicValueEnum<'ctx>>,
-    ) {
-        let return_block = context.current_function().borrow().return_block();
-        context.build_unconditional_branch(return_block);
-        context.set_basic_block(return_block);
-        match return_value {
-            Some(value) => context.build_return(Some(&value)),
-            None => context.build_return(None),
-        }
-    }
-
-    /// Get the nth function paramater.
-    fn paramater<'ctx>(
-        context: &Context<'ctx, D>,
-        index: usize,
-    ) -> inkwell::values::BasicValueEnum<'ctx> {
-        let name = Self::NAME;
-        context
-            .get_function(name)
-            .unwrap_or_else(|| panic!("runtime function {name} should be declared"))
-            .borrow()
-            .declaration()
-            .function_value()
-            .get_nth_param(index as u32)
-            .unwrap_or_else(|| panic!("runtime function {name} should have parameter #{index}"))
-    }
-}

crates/llvm-context/src/polkavm/context/tests.rs

@@ -10,20 +10,12 @@ pub fn create_context(
     llvm: &inkwell::context::Context,
     optimizer_settings: OptimizerSettings,
 ) -> Context<DummyDependency> {
-    crate::initialize_llvm(crate::Target::PVM, "resolc", Default::default());
+    crate::polkavm::initialize_target();
 
     let module = llvm.create_module("test");
     let optimizer = Optimizer::new(optimizer_settings);
 
-    Context::<DummyDependency>::new(
-        llvm,
-        module,
-        optimizer,
-        None,
-        true,
-        Default::default(),
-        Default::default(),
-    )
+    Context::<DummyDependency>::new(llvm, module, optimizer, None, true, Default::default())
 }
 
 #[test]

crates/llvm-context/src/polkavm/evm/arithmetic.rs

@@ -2,13 +2,8 @@
 
 use inkwell::values::BasicValue;
 
-use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::PolkaVMDivisionFunction;
-use crate::PolkaVMRemainderFunction;
-use crate::PolkaVMSignedDivisionFunction;
-use crate::PolkaVMSignedRemainderFunction;
 
 /// Translates the arithmetic addition.
 pub fn addition<'ctx, D>(
@@ -64,11 +59,11 @@ pub fn division<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMDivisionFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMDivisionFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "div")
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    wrapped_division(context, operand_2, || {
+        Ok(context
+            .builder()
+            .build_int_unsigned_div(operand_1, operand_2, "DIV")?)
+    })
 }
 
 /// Translates the arithmetic remainder.
@@ -80,11 +75,11 @@ pub fn remainder<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMRemainderFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMRemainderFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "rem")
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    wrapped_division(context, operand_2, || {
+        Ok(context
+            .builder()
+            .build_int_unsigned_rem(operand_1, operand_2, "MOD")?)
+    })
 }
 
 /// Translates the signed arithmetic division.
@@ -99,11 +94,54 @@ pub fn division_signed<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMSignedDivisionFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "sdiv")
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    assert_eq!(
+        operand_2.get_type().get_bit_width(),
+        revive_common::BIT_LENGTH_WORD as u32
+    );
+
+    let block_calculate = context.append_basic_block("calculate");
+    let block_overflow = context.append_basic_block("overflow");
+    let block_select = context.append_basic_block("select_result");
+    let block_origin = context.basic_block();
+    context.builder().build_switch(
+        operand_2,
+        block_calculate,
+        &[
+            (context.word_type().const_zero(), block_select),
+            (context.word_type().const_all_ones(), block_overflow),
+        ],
+    )?;
+
+    context.set_basic_block(block_calculate);
+    let quotient = context
+        .builder()
+        .build_int_signed_div(operand_1, operand_2, "SDIV")?;
+    context.build_unconditional_branch(block_select);
+
+    context.set_basic_block(block_overflow);
+    let max_uint = context.builder().build_int_z_extend(
+        context
+            .integer_type(revive_common::BIT_LENGTH_WORD - 1)
+            .const_all_ones(),
+        context.word_type(),
+        "max_uint",
+    )?;
+    let is_operand_1_overflow = context.builder().build_int_compare(
+        inkwell::IntPredicate::EQ,
+        operand_1,
+        context.builder().build_int_neg(max_uint, "min_uint")?,
+        "is_operand_1_overflow",
+    )?;
+    context.build_conditional_branch(is_operand_1_overflow, block_select, block_calculate)?;
+
+    context.set_basic_block(block_select);
+    let result = context.builder().build_phi(context.word_type(), "result")?;
+    result.add_incoming(&[
+        (&operand_1, block_overflow),
+        (&context.word_const(0), block_origin),
+        (&quotient.as_basic_value_enum(), block_calculate),
+    ]);
+    Ok(result.as_basic_value())
 }
 
 /// Translates the signed arithmetic remainder.
@@ -115,9 +153,53 @@ pub fn remainder_signed<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMSignedRemainderFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &[operand_1.into(), operand_2.into()], "srem")
-        .unwrap_or_else(|| panic!("revive runtime function {name} should return a value",)))
+    wrapped_division(context, operand_2, || {
+        Ok(context
+            .builder()
+            .build_int_signed_rem(operand_1, operand_2, "SMOD")?)
+    })
+}
+
+/// Wrap division operations so that zero will be returned if the
+/// denominator is zero (see also Ethereum YP Appendix H.2).
+///
+/// The closure is expected to calculate and return the quotient.
+///
+/// The result is either the calculated quotient or zero,
+///  selected at runtime.
+fn wrapped_division<'ctx, D, F, T>(
+    context: &Context<'ctx, D>,
+    denominator: inkwell::values::IntValue<'ctx>,
+    f: F,
+) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
+where
+    D: Dependency + Clone,
+    F: FnOnce() -> anyhow::Result<T>,
+    T: inkwell::values::IntMathValue<'ctx>,
+{
+    assert_eq!(
+        denominator.get_type().get_bit_width(),
+        revive_common::BIT_LENGTH_WORD as u32
+    );
+
+    let block_calculate = context.append_basic_block("calculate");
+    let block_select = context.append_basic_block("select");
+    let block_origin = context.basic_block();
+    context.builder().build_switch(
+        denominator,
+        block_calculate,
+        &[(context.word_const(0), block_select)],
+    )?;
+
+    context.set_basic_block(block_calculate);
+    let calculated_value = f()?.as_basic_value_enum();
+    context.build_unconditional_branch(block_select);
+
+    context.set_basic_block(block_select);
+    let result = context.builder().build_phi(context.word_type(), "result")?;
+    result.add_incoming(&[
+        (&context.word_const(0), block_origin),
+        (&calculated_value, block_calculate),
+    ]);
+    Ok(result.as_basic_value())
 }

crates/llvm-context/src/polkavm/evm/call.rs

@@ -8,7 +8,6 @@ use crate::polkavm::Dependency;
 
 const STATIC_CALL_FLAG: u32 = 0b0001_0000;
 const REENTRANT_CALL_FLAG: u32 = 0b0000_1000;
-const SOLIDITY_TRANSFER_GAS_STIPEND_THRESHOLD: u64 = 2300;
 
 /// Translates a contract call.
 #[allow(clippy::too_many_arguments)]
@@ -38,67 +37,60 @@ where
     let output_offset = context.safe_truncate_int_to_xlen(output_offset)?;
     let output_length = context.safe_truncate_int_to_xlen(output_length)?;
 
+    // TODO: What to supply here? Is there a weight to gas?
+    let _gas = context
+        .builder()
+        .build_int_truncate(gas, context.integer_type(64), "gas")?;
+
     let input_pointer = context.build_heap_gep(input_offset, input_length)?;
     let output_pointer = context.build_heap_gep(output_offset, output_length)?;
 
     let output_length_pointer = context.build_alloca_at_entry(context.xlen_type(), "output_length");
     context.build_store(output_length_pointer, output_length)?;
 
-    let (flags, deposit_limit_value) = if static_call {
-        let flags = REENTRANT_CALL_FLAG | STATIC_CALL_FLAG;
-        (
-            context.xlen_type().const_int(flags as u64, false),
-            context.word_type().const_zero(),
-        )
-    } else {
-        call_reentrancy_heuristic(context, gas, input_length, output_length)?
-    };
-
     let deposit_pointer = context.build_alloca_at_entry(context.word_type(), "deposit_pointer");
-    context.build_store(deposit_pointer, deposit_limit_value)?;
+    context.build_store(deposit_pointer, context.word_type().const_all_ones())?;
 
-    let flags_and_callee = revive_runtime_api::calling_convention::pack_hi_lo_reg(
+    let flags = if static_call {
+        REENTRANT_CALL_FLAG | STATIC_CALL_FLAG
+    } else {
+        REENTRANT_CALL_FLAG
+    };
+    let flags = context.xlen_type().const_int(flags as u64, false);
+
+    let argument_type = revive_runtime_api::calling_convention::call(context.llvm());
+    let argument_pointer = context.build_alloca_at_entry(argument_type, "call_arguments");
+    let arguments = &[
+        flags.as_basic_value_enum(),
+        address_pointer.value.as_basic_value_enum(),
+        context
+            .integer_const(revive_common::BIT_LENGTH_X64, u64::MAX)
+            .as_basic_value_enum(),
+        context
+            .integer_const(revive_common::BIT_LENGTH_X64, u64::MAX)
+            .as_basic_value_enum(),
+        deposit_pointer.value.as_basic_value_enum(),
+        value_pointer.value.as_basic_value_enum(),
+        input_pointer.value.as_basic_value_enum(),
+        input_length.as_basic_value_enum(),
+        output_pointer.value.as_basic_value_enum(),
+        output_length_pointer.value.as_basic_value_enum(),
+    ];
+    revive_runtime_api::calling_convention::spill(
         context.builder(),
-        context.llvm(),
-        flags,
-        address_pointer.to_int(context),
-        "address_and_callee",
-    )?;
-    let deposit_and_value = revive_runtime_api::calling_convention::pack_hi_lo_reg(
-        context.builder(),
-        context.llvm(),
-        deposit_pointer.to_int(context),
-        value_pointer.to_int(context),
-        "deposit_and_value",
-    )?;
-    let input_data = revive_runtime_api::calling_convention::pack_hi_lo_reg(
-        context.builder(),
-        context.llvm(),
-        input_length,
-        input_pointer.to_int(context),
-        "input_data",
-    )?;
-    let output_data = revive_runtime_api::calling_convention::pack_hi_lo_reg(
-        context.builder(),
-        context.llvm(),
-        output_length_pointer.to_int(context),
-        output_pointer.to_int(context),
-        "output_data",
+        argument_pointer.value,
+        argument_type,
+        arguments,
     )?;
 
     let name = revive_runtime_api::polkavm_imports::CALL;
+    let argument_pointer = context.builder().build_ptr_to_int(
+        argument_pointer.value,
+        context.xlen_type(),
+        "call_argument_pointer",
+    )?;
     let success = context
-        .build_runtime_call(
-            name,
-            &[
-                flags_and_callee.into(),
-                context.register_type().const_all_ones().into(),
-                context.register_type().const_all_ones().into(),
-                deposit_and_value.into(),
-                input_data.into(),
-                output_data.into(),
-            ],
-        )
+        .build_runtime_call(name, &[argument_pointer.into()])
         .unwrap_or_else(|| panic!("{name} should return a value"))
         .into_int_value();
 
@@ -118,7 +110,7 @@ where
 #[allow(clippy::too_many_arguments)]
 pub fn delegate_call<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    _gas: inkwell::values::IntValue<'ctx>,
+    gas: inkwell::values::IntValue<'ctx>,
     address: inkwell::values::IntValue<'ctx>,
     input_offset: inkwell::values::IntValue<'ctx>,
     input_length: inkwell::values::IntValue<'ctx>,
@@ -136,6 +128,11 @@ where
     let output_offset = context.safe_truncate_int_to_xlen(output_offset)?;
     let output_length = context.safe_truncate_int_to_xlen(output_length)?;
 
+    // TODO: What to supply here? Is there a weight to gas?
+    let _gas = context
+        .builder()
+        .build_int_truncate(gas, context.integer_type(64), "gas")?;
+
     let input_pointer = context.build_heap_gep(input_offset, input_length)?;
     let output_pointer = context.build_heap_gep(output_offset, output_length)?;
 
@@ -147,41 +144,38 @@ where
 
     let flags = context.xlen_type().const_int(0u64, false);
 
-    let flags_and_callee = revive_runtime_api::calling_convention::pack_hi_lo_reg(
+    let argument_type = revive_runtime_api::calling_convention::delegate_call(context.llvm());
+    let argument_pointer = context.build_alloca_at_entry(argument_type, "delegate_call_arguments");
+    let arguments = &[
+        flags.as_basic_value_enum(),
+        address_pointer.value.as_basic_value_enum(),
+        context
+            .integer_const(revive_common::BIT_LENGTH_X64, u64::MAX)
+            .as_basic_value_enum(),
+        context
+            .integer_const(revive_common::BIT_LENGTH_X64, u64::MAX)
+            .as_basic_value_enum(),
+        deposit_pointer.value.as_basic_value_enum(),
+        input_pointer.value.as_basic_value_enum(),
+        input_length.as_basic_value_enum(),
+        output_pointer.value.as_basic_value_enum(),
+        output_length_pointer.value.as_basic_value_enum(),
+    ];
+    revive_runtime_api::calling_convention::spill(
         context.builder(),
-        context.llvm(),
-        flags,
-        address_pointer.to_int(context),
-        "address_and_callee",
-    )?;
-    let input_data = revive_runtime_api::calling_convention::pack_hi_lo_reg(
-        context.builder(),
-        context.llvm(),
-        input_length,
-        input_pointer.to_int(context),
-        "input_data",
-    )?;
-    let output_data = revive_runtime_api::calling_convention::pack_hi_lo_reg(
-        context.builder(),
-        context.llvm(),
-        output_length_pointer.to_int(context),
-        output_pointer.to_int(context),
-        "output_data",
+        argument_pointer.value,
+        argument_type,
+        arguments,
     )?;
 
     let name = revive_runtime_api::polkavm_imports::DELEGATE_CALL;
+    let argument_pointer = context.builder().build_ptr_to_int(
+        argument_pointer.value,
+        context.xlen_type(),
+        "delegate_call_argument_pointer",
+    )?;
     let success = context
-        .build_runtime_call(
-            name,
-            &[
-                flags_and_callee.into(),
-                context.register_type().const_all_ones().into(),
-                context.register_type().const_all_ones().into(),
-                deposit_pointer.to_int(context).into(),
-                input_data.into(),
-                output_data.into(),
-            ],
-        )
+        .build_runtime_call(name, &[argument_pointer.into()])
         .unwrap_or_else(|| panic!("{name} should return a value"))
         .into_int_value();
 
@@ -215,86 +209,3 @@ where
         .resolve_library(path.as_str())?
         .as_basic_value_enum())
 }
-
-/// The Solidity `address.transfer` and `address.send` call detection heuristic.
-///
-/// # Why
-/// This heuristic is an additional security feature to guard against re-entrancy attacks
-/// in case contract authors violate Solidity best practices and use `address.transfer` or
-/// `address.send`.
-/// While contract authors are supposed to never use `address.transfer` or `address.send`,
-/// for a small cost we can be extra defensive about it.
-///
-/// # How
-/// The gas stipend emitted by solc for `transfer` and `send` is not static, thus:
-/// - Dynamically allow re-entrancy only for calls considered not transfer or send.
-/// - Detected balance transfers will supply 0 deposit limit instead of `u256::MAX`.
-///
-/// Calls are considered transfer or send if:
-/// - (Input length | Output lenght) == 0;
-/// - Gas <= 2300;
-///
-/// # Returns
-/// The call flags xlen `IntValue` and the deposit limit word `IntValue`.
-fn call_reentrancy_heuristic<'ctx, D>(
-    context: &mut Context<'ctx, D>,
-    gas: inkwell::values::IntValue<'ctx>,
-    input_length: inkwell::values::IntValue<'ctx>,
-    output_length: inkwell::values::IntValue<'ctx>,
-) -> anyhow::Result<(
-    inkwell::values::IntValue<'ctx>,
-    inkwell::values::IntValue<'ctx>,
-)>
-where
-    D: Dependency + Clone,
-{
-    // Branch-free SSA implementation: First derive the heuristic boolean (int1) value.
-    let input_length_or_output_length =
-        context
-            .builder()
-            .build_or(input_length, output_length, "input_length_or_output_length")?;
-    let is_no_input_no_output = context.builder().build_int_compare(
-        inkwell::IntPredicate::EQ,
-        context.xlen_type().const_zero(),
-        input_length_or_output_length,
-        "is_no_input_no_output",
-    )?;
-    let gas_stipend = context
-        .word_type()
-        .const_int(SOLIDITY_TRANSFER_GAS_STIPEND_THRESHOLD, false);
-    let is_gas_stipend_for_transfer_or_send = context.builder().build_int_compare(
-        inkwell::IntPredicate::ULE,
-        gas,
-        gas_stipend,
-        "is_gas_stipend_for_transfer_or_send",
-    )?;
-    let is_balance_transfer = context.builder().build_and(
-        is_no_input_no_output,
-        is_gas_stipend_for_transfer_or_send,
-        "is_balance_transfer",
-    )?;
-    let is_regular_call = context
-        .builder()
-        .build_not(is_balance_transfer, "is_balance_transfer_inverted")?;
-
-    // Call flag: Left shift the heuristic boolean value.
-    let is_regular_call_xlen = context.builder().build_int_z_extend(
-        is_regular_call,
-        context.xlen_type(),
-        "is_balance_transfer_xlen",
-    )?;
-    let call_flags = context.builder().build_left_shift(
-        is_regular_call_xlen,
-        context.xlen_type().const_int(3, false),
-        "flags",
-    )?;
-
-    // Deposit limit value: Sign-extended the heuristic boolean value.
-    let deposit_limit_value = context.builder().build_int_s_extend(
-        is_regular_call,
-        context.word_type(),
-        "deposit_limit_value",
-    )?;
-
-    Ok((call_flags, deposit_limit_value))
-}

crates/llvm-context/src/polkavm/evm/context.rs

@@ -122,20 +122,12 @@ where
 
 /// Translates the `coinbase` instruction.
 pub fn coinbase<'ctx, D>(
-    context: &mut Context<'ctx, D>,
+    _context: &mut Context<'ctx, D>,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
     D: Dependency + Clone,
 {
-    let pointer = context.build_alloca_at_entry(
-        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
-        "coinbase_output",
-    );
-    context.build_runtime_call(
-        revive_runtime_api::polkavm_imports::BLOCK_AUTHOR,
-        &[pointer.to_int(context).into()],
-    );
-    context.build_load_address(pointer)
+    todo!()
 }
 
 /// Translates the `basefee` instruction.

crates/llvm-context/src/polkavm/evm/create.rs

@@ -26,13 +26,21 @@ where
 
     let code_hash_pointer = context.build_heap_gep(input_offset, input_length)?;
 
+    let input_data_pointer = context.build_gep(
+        code_hash_pointer,
+        &[context
+            .xlen_type()
+            .const_int(revive_common::BYTE_LENGTH_WORD as u64, false)],
+        context.byte_type(),
+        "input_ptr_parameter_offset",
+    );
+
     let value_pointer = context.build_alloca_at_entry(context.value_type(), "transferred_value");
     context.build_store(value_pointer, value)?;
 
     let salt_pointer = match salt {
         Some(salt) => {
             let salt_pointer = context.build_alloca_at_entry(context.word_type(), "salt_pointer");
-            let salt = context.build_byte_swap(salt.into())?;
             context.build_store(salt_pointer, salt)?;
             salt_pointer
         }
@@ -48,38 +56,40 @@ where
     let deposit_pointer = context.build_alloca_at_entry(context.word_type(), "deposit_pointer");
     context.build_store(deposit_pointer, context.word_type().const_all_ones())?;
 
-    let deposit_and_value = revive_runtime_api::calling_convention::pack_hi_lo_reg(
+    let argument_type = revive_runtime_api::calling_convention::instantiate(context.llvm());
+    let argument_pointer = context.build_alloca_at_entry(argument_type, "instantiate_arguments");
+    let arguments = &[
+        code_hash_pointer.value.as_basic_value_enum(),
+        context
+            .integer_const(revive_common::BIT_LENGTH_X64, u64::MAX)
+            .as_basic_value_enum(),
+        context
+            .integer_const(revive_common::BIT_LENGTH_X64, u64::MAX)
+            .as_basic_value_enum(),
+        deposit_pointer.value.as_basic_value_enum(),
+        value_pointer.value.as_basic_value_enum(),
+        input_data_pointer.value.as_basic_value_enum(),
+        input_length.as_basic_value_enum(),
+        address_pointer.value.as_basic_value_enum(),
+        context.sentinel_pointer().value.as_basic_value_enum(),
+        context.sentinel_pointer().value.as_basic_value_enum(),
+        salt_pointer.value.as_basic_value_enum(),
+    ];
+    revive_runtime_api::calling_convention::spill(
         context.builder(),
-        context.llvm(),
-        deposit_pointer.to_int(context),
-        value_pointer.to_int(context),
-        "deposit_and_value",
-    )?;
-    let input_data = revive_runtime_api::calling_convention::pack_hi_lo_reg(
-        context.builder(),
-        context.llvm(),
-        input_length,
-        code_hash_pointer.to_int(context),
-        "input_data",
-    )?;
-    let address_and_salt = revive_runtime_api::calling_convention::pack_hi_lo_reg(
-        context.builder(),
-        context.llvm(),
-        address_pointer.to_int(context),
-        salt_pointer.to_int(context),
-        "output_data",
+        argument_pointer.value,
+        argument_type,
+        arguments,
     )?;
 
+    let argument_pointer = context.builder().build_ptr_to_int(
+        argument_pointer.value,
+        context.xlen_type(),
+        "instantiate_argument_pointer",
+    )?;
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::INSTANTIATE,
-        &[
-            context.register_type().const_all_ones().into(),
-            context.register_type().const_all_ones().into(),
-            deposit_and_value.into(),
-            input_data.into(),
-            context.register_type().const_all_ones().into(),
-            address_and_salt.into(),
-        ],
+        &[argument_pointer.into()],
     );
 
     let address = context.build_byte_swap(context.build_load(address_pointer, "address")?)?;

crates/llvm-context/src/polkavm/evm/event.rs

@@ -2,183 +2,84 @@
 
 use inkwell::values::BasicValue;
 
-use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// A function for emitting EVM event logs from contract code.
-pub struct EventLog<const N: usize>;
-
-impl<D, const N: usize> RuntimeFunction<D> for EventLog<N>
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = match N {
-        0 => "__revive_log_0",
-        1 => "__revive_log_1",
-        2 => "__revive_log_2",
-        3 => "__revive_log_3",
-        4 => "__revive_log_4",
-        _ => unreachable!(),
-    };
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        let mut parameter_types = vec![context.xlen_type().into(), context.xlen_type().into()];
-        parameter_types.extend_from_slice(&[context.word_type().into(); N]);
-        context.void_type().fn_type(&parameter_types, false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let input_offset = Self::paramater(context, 0).into_int_value();
-        let input_length = Self::paramater(context, 1).into_int_value();
-        let input_pointer = context.builder().build_ptr_to_int(
-            context.build_heap_gep(input_offset, input_length)?.value,
-            context.xlen_type(),
-            "event_input_offset",
-        )?;
-
-        let arguments = if N == 0 {
-            [
-                context.xlen_type().const_zero().as_basic_value_enum(),
-                context.xlen_type().const_zero().as_basic_value_enum(),
-                input_pointer.as_basic_value_enum(),
-                input_length.as_basic_value_enum(),
-            ]
-        } else {
-            let topics_buffer_size = N * revive_common::BYTE_LENGTH_WORD;
-            let topics_buffer_pointer = context.build_alloca_at_entry(
-                context.byte_type().array_type(topics_buffer_size as u32),
-                "topics_buffer",
-            );
-
-            for n in 0..N {
-                let topic = Self::paramater(context, n + 2);
-                let topic_buffer_offset = context
-                    .xlen_type()
-                    .const_int((n * revive_common::BYTE_LENGTH_WORD) as u64, false);
-                context.build_store(
-                    context.build_gep(
-                        topics_buffer_pointer,
-                        &[context.xlen_type().const_zero(), topic_buffer_offset],
-                        context.byte_type(),
-                        &format!("topic_buffer_{N}_gep"),
-                    ),
-                    context.build_byte_swap(topic.as_basic_value_enum())?,
-                )?;
-            }
-
-            [
-                context
-                    .builder()
-                    .build_ptr_to_int(
-                        topics_buffer_pointer.value,
-                        context.xlen_type(),
-                        "event_topics_offset",
-                    )?
-                    .as_basic_value_enum(),
-                context
-                    .xlen_type()
-                    .const_int(N as u64, false)
-                    .as_basic_value_enum(),
-                input_pointer.as_basic_value_enum(),
-                input_length.as_basic_value_enum(),
-            ]
-        };
-
-        context.build_runtime_call(
-            revive_runtime_api::polkavm_imports::DEPOSIT_EVENT,
-            &arguments,
-        );
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<0>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<1>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<2>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<3>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-impl<D> WriteLLVM<D> for EventLog<4>
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
 
 /// Translates a log or event call.
-pub fn log<'ctx, D, const N: usize>(
+///
+/// TODO: Splitting up into dedicated functions (log0..log4)
+/// could potentially decrease code sizes (LLVM can still decide to inline).
+/// However, passing i256 parameters is counter productive and
+/// I've found that splitting it up actualy increases code size.
+/// Should be reviewed after 64bit support.
+pub fn log<'ctx, D>(
     context: &mut Context<'ctx, D>,
     input_offset: inkwell::values::IntValue<'ctx>,
     input_length: inkwell::values::IntValue<'ctx>,
-    topics: [inkwell::values::BasicValueEnum<'ctx>; N],
+    topics: Vec<inkwell::values::IntValue<'ctx>>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    let declaration = <EventLog<N> as RuntimeFunction<D>>::declaration(context);
-    let mut arguments = vec![
-        context.safe_truncate_int_to_xlen(input_offset)?.into(),
-        context.safe_truncate_int_to_xlen(input_length)?.into(),
-    ];
-    arguments.extend_from_slice(&topics);
-    context.build_call(declaration, &arguments, "log");
+    let input_offset = context.safe_truncate_int_to_xlen(input_offset)?;
+    let input_length = context.safe_truncate_int_to_xlen(input_length)?;
+    let input_pointer = context.builder().build_ptr_to_int(
+        context.build_heap_gep(input_offset, input_length)?.value,
+        context.xlen_type(),
+        "event_input_offset",
+    )?;
+
+    let arguments = if topics.is_empty() {
+        [
+            context.xlen_type().const_zero().as_basic_value_enum(),
+            context.xlen_type().const_zero().as_basic_value_enum(),
+            input_pointer.as_basic_value_enum(),
+            input_length.as_basic_value_enum(),
+        ]
+    } else {
+        let topics_buffer_size = topics.len() * revive_common::BYTE_LENGTH_WORD;
+        let topics_buffer_pointer = context.build_alloca(
+            context.byte_type().array_type(topics_buffer_size as u32),
+            "topics_buffer",
+        );
+
+        for (n, topic) in topics.iter().enumerate() {
+            let topic_buffer_offset = context
+                .xlen_type()
+                .const_int((n * revive_common::BYTE_LENGTH_WORD) as u64, false);
+            context.build_store(
+                context.build_gep(
+                    topics_buffer_pointer,
+                    &[context.xlen_type().const_zero(), topic_buffer_offset],
+                    context.byte_type(),
+                    "topic_buffer_gep",
+                ),
+                context.build_byte_swap(topic.as_basic_value_enum())?,
+            )?;
+        }
+
+        [
+            context
+                .builder()
+                .build_ptr_to_int(
+                    topics_buffer_pointer.value,
+                    context.xlen_type(),
+                    "event_topics_offset",
+                )?
+                .as_basic_value_enum(),
+            context
+                .xlen_type()
+                .const_int(topics.len() as u64, false)
+                .as_basic_value_enum(),
+            input_pointer.as_basic_value_enum(),
+            input_length.as_basic_value_enum(),
+        ]
+    };
+
+    let _ = context.build_runtime_call(
+        revive_runtime_api::polkavm_imports::DEPOSIT_EVENT,
+        &arguments,
+    );
+
     Ok(())
 }

crates/llvm-context/src/polkavm/evm/immutable.rs

@@ -4,206 +4,10 @@ use inkwell::types::BasicType;
 
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::code_type::CodeType;
+use crate::polkavm::context::function::runtime;
 use crate::polkavm::context::pointer::Pointer;
-use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// A function for requesting the immutable data from the runtime.
-/// This is a special function that is only used by the front-end generated code.
-///
-/// The runtime API is called lazily and subsequent calls are no-ops.
-///
-/// The bytes written is asserted to match the expected length.
-/// This should never fail; the length is known.
-/// However, this is a one time assertion, hence worth it.
-pub struct Load;
-
-impl<D> RuntimeFunction<D> for Load
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_immutable_data";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(Default::default(), false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let immutable_data_size_pointer = context
-            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
-            .value
-            .as_pointer_value();
-        let immutable_data_size = context.build_load(
-            Pointer::new(
-                context.xlen_type(),
-                AddressSpace::Stack,
-                immutable_data_size_pointer,
-            ),
-            "immutable_data_size_load",
-        )?;
-
-        let load_immutable_data_block = context.append_basic_block("load_immutables_block");
-        let return_block = context.current_function().borrow().return_block();
-        let immutable_data_size_is_zero = context.builder().build_int_compare(
-            inkwell::IntPredicate::EQ,
-            context.xlen_type().const_zero(),
-            immutable_data_size.into_int_value(),
-            "immutable_data_size_is_zero",
-        )?;
-        context.build_conditional_branch(
-            immutable_data_size_is_zero,
-            return_block,
-            load_immutable_data_block,
-        )?;
-
-        context.set_basic_block(load_immutable_data_block);
-        let output_pointer = context
-            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
-            .value
-            .as_pointer_value();
-        context.build_runtime_call(
-            revive_runtime_api::polkavm_imports::GET_IMMUTABLE_DATA,
-            &[
-                context
-                    .builder()
-                    .build_ptr_to_int(output_pointer, context.xlen_type(), "ptr_to_xlen")?
-                    .into(),
-                context
-                    .builder()
-                    .build_ptr_to_int(
-                        immutable_data_size_pointer,
-                        context.xlen_type(),
-                        "ptr_to_xlen",
-                    )?
-                    .into(),
-            ],
-        );
-        let bytes_written = context.builder().build_load(
-            context.xlen_type(),
-            immutable_data_size_pointer,
-            "bytes_written",
-        )?;
-        context.builder().build_store(
-            immutable_data_size_pointer,
-            context.xlen_type().const_zero(),
-        )?;
-        let overflow_block = context.append_basic_block("immutable_data_overflow");
-        let is_overflow = context.builder().build_int_compare(
-            inkwell::IntPredicate::UGT,
-            immutable_data_size.into_int_value(),
-            bytes_written.into_int_value(),
-            "is_overflow",
-        )?;
-        context.build_conditional_branch(is_overflow, overflow_block, return_block)?;
-
-        context.set_basic_block(overflow_block);
-        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
-        context.build_unreachable();
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for Load
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-/// Store the immutable data from the constructor code.
-pub struct Store;
-
-impl<D> RuntimeFunction<D> for Store
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_immutable_data";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(Default::default(), false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let immutable_data_size_pointer = context
-            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
-            .value
-            .as_pointer_value();
-        let immutable_data_size = context.build_load(
-            Pointer::new(
-                context.xlen_type(),
-                AddressSpace::Stack,
-                immutable_data_size_pointer,
-            ),
-            "immutable_data_size_load",
-        )?;
-
-        let write_immutable_data_block = context.append_basic_block("write_immutables_block");
-        let join_return_block = context.append_basic_block("join_return_block");
-        let immutable_data_size_is_zero = context.builder().build_int_compare(
-            inkwell::IntPredicate::EQ,
-            context.xlen_type().const_zero(),
-            immutable_data_size.into_int_value(),
-            "immutable_data_size_is_zero",
-        )?;
-        context.build_conditional_branch(
-            immutable_data_size_is_zero,
-            join_return_block,
-            write_immutable_data_block,
-        )?;
-
-        context.set_basic_block(write_immutable_data_block);
-        let immutable_data_pointer = context
-            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
-            .value
-            .as_pointer_value();
-        context.build_runtime_call(
-            revive_runtime_api::polkavm_imports::SET_IMMUTABLE_DATA,
-            &[
-                context
-                    .builder()
-                    .build_ptr_to_int(
-                        immutable_data_pointer,
-                        context.xlen_type(),
-                        "immutable_data_pointer_to_xlen",
-                    )?
-                    .into(),
-                immutable_data_size,
-            ],
-        );
-        context.build_unconditional_branch(join_return_block);
-
-        context.set_basic_block(join_return_block);
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for Store
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
 
 /// Translates the contract immutable load.
 ///
@@ -223,15 +27,14 @@ where
         }
         Some(CodeType::Deploy) => load_from_memory(context, index),
         Some(CodeType::Runtime) => {
-            let name = <Load as RuntimeFunction<D>>::NAME;
             context.build_call(
                 context
-                    .get_function(name)
+                    .get_function(runtime::FUNCTION_LOAD_IMMUTABLE_DATA)
                     .expect("is always declared for runtime code")
                     .borrow()
                     .declaration(),
                 &[],
-                name,
+                runtime::FUNCTION_LOAD_IMMUTABLE_DATA,
             );
             load_from_memory(context, index)
         }

crates/llvm-context/src/polkavm/evm/memory.rs

@@ -85,14 +85,5 @@ where
         offset,
         "mstore8_destination",
     );
-    let pointer = context.build_sbrk(
-        pointer.to_int(context),
-        context.xlen_type().const_int(1, false),
-    )?;
-    context
-        .builder()
-        .build_store(pointer, value)?
-        .set_alignment(revive_common::BYTE_LENGTH_BYTE as u32)
-        .expect("Alignment is valid");
-    Ok(())
+    context.build_store(pointer, value)
 }

crates/llvm-context/src/polkavm/evm/return.rs

@@ -1,9 +1,9 @@
 //! Translates the transaction return operations.
 
+use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::code_type::CodeType;
-use crate::polkavm::context::runtime::RuntimeFunction;
+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::Context;
-use crate::polkavm::evm::immutable::Store;
 use crate::polkavm::Dependency;
 
 /// Translates the `return` instruction.
@@ -18,11 +18,55 @@ where
     match context.code_type() {
         None => anyhow::bail!("Return is not available if the contract part is undefined"),
         Some(CodeType::Deploy) => {
-            context.build_call(
-                <Store as RuntimeFunction<D>>::declaration(context),
-                Default::default(),
-                "store_immutable_data",
+            let immutable_data_size_pointer = context
+                .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
+                .value
+                .as_pointer_value();
+            let immutable_data_size = context.build_load(
+                Pointer::new(
+                    context.xlen_type(),
+                    AddressSpace::Stack,
+                    immutable_data_size_pointer,
+                ),
+                "immutable_data_size_load",
+            )?;
+
+            let write_immutable_data_block = context.append_basic_block("write_immutables_block");
+            let join_return_block = context.append_basic_block("join_return_block");
+            let immutable_data_size_is_zero = context.builder().build_int_compare(
+                inkwell::IntPredicate::EQ,
+                context.xlen_type().const_zero(),
+                immutable_data_size.into_int_value(),
+                "immutable_data_size_is_zero",
+            )?;
+            context.build_conditional_branch(
+                immutable_data_size_is_zero,
+                join_return_block,
+                write_immutable_data_block,
+            )?;
+
+            context.set_basic_block(write_immutable_data_block);
+            let immutable_data_pointer = context
+                .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
+                .value
+                .as_pointer_value();
+            context.build_runtime_call(
+                revive_runtime_api::polkavm_imports::SET_IMMUTABLE_DATA,
+                &[
+                    context
+                        .builder()
+                        .build_ptr_to_int(
+                            immutable_data_pointer,
+                            context.xlen_type(),
+                            "immutable_data_pointer_to_xlen",
+                        )?
+                        .into(),
+                    immutable_data_size,
+                ],
             );
+            context.build_unconditional_branch(join_return_block);
+
+            context.set_basic_block(join_return_block);
         }
         Some(CodeType::Runtime) => {}
     }
@@ -56,7 +100,11 @@ pub fn stop<D>(context: &mut Context<D>) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    r#return(context, context.word_const(0), context.word_const(0))
+    r#return(
+        context,
+        context.integer_const(crate::polkavm::XLEN, 0),
+        context.integer_const(crate::polkavm::XLEN, 0),
+    )
 }
 
 /// Translates the `invalid` instruction.

crates/llvm-context/src/polkavm/evm/storage.rs

@@ -1,12 +1,8 @@
 //! Translates the storage operations.
 
-use crate::polkavm::context::runtime::RuntimeFunction;
+use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::PolkaVMLoadStorageWordFunction;
-use crate::PolkaVMLoadTransientStorageWordFunction;
-use crate::PolkaVMStoreStorageWordFunction;
-use crate::PolkaVMStoreTransientStorageWordFunction;
 
 /// Translates the storage load.
 pub fn load<'ctx, D>(
@@ -16,12 +12,10 @@ pub fn load<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
-    let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.into()];
-    Ok(context
-        .build_call(declaration, &arguments, "storage_load")
-        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    slot_ptr.address_space = AddressSpace::Storage;
+    context.builder().build_store(slot_ptr.value, position)?;
+    context.build_load(slot_ptr, "storage_load_value")
 }
 
 /// Translates the storage store.
@@ -33,9 +27,10 @@ pub fn store<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.into(), value.into()];
-    context.build_call(declaration, &arguments, "storage_store");
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    slot_ptr.address_space = AddressSpace::Storage;
+    context.builder().build_store(slot_ptr.value, position)?;
+    context.build_store(slot_ptr, value)?;
     Ok(())
 }
 
@@ -47,13 +42,10 @@ pub fn transient_load<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::NAME;
-    let arguments = [position.into()];
-    let declaration =
-        <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    Ok(context
-        .build_call(declaration, &arguments, "transient_storage_load")
-        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    slot_ptr.address_space = AddressSpace::TransientStorage;
+    context.builder().build_store(slot_ptr.value, position)?;
+    context.build_load(slot_ptr, "transient_storage_load_value")
 }
 
 /// Translates the transient storage store.
@@ -65,9 +57,9 @@ pub fn transient_store<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let declaration =
-        <PolkaVMStoreTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.into(), value.into()];
-    context.build_call(declaration, &arguments, "transient_storage_store");
+    let mut slot_ptr = context.build_alloca_at_entry(context.word_type(), "slot_pointer");
+    slot_ptr.address_space = AddressSpace::TransientStorage;
+    context.builder().build_store(slot_ptr.value, position)?;
+    context.build_store(slot_ptr, value)?;
     Ok(())
 }

crates/llvm-context/src/polkavm/mod.rs

@@ -3,6 +3,7 @@
 pub mod r#const;
 pub mod context;
 pub mod evm;
+pub mod metadata_hash;
 
 pub use self::r#const::*;
 
@@ -17,6 +18,11 @@ use sha3::Digest;
 use self::context::build::Build;
 use self::context::Context;
 
+/// Initializes the PolkaVM target machine.
+pub fn initialize_target() {
+    inkwell::targets::Target::initialize_riscv(&Default::default());
+}
+
 /// Builds PolkaVM assembly text.
 pub fn build_assembly_text(
     contract_path: &str,
@@ -53,6 +59,7 @@ pub fn build_assembly_text(
 }
 
 /// Implemented by items which are translated into LLVM IR.
+#[allow(clippy::upper_case_acronyms)]
 pub trait WriteLLVM<D>
 where
     D: Dependency + Clone,
@@ -89,7 +96,6 @@ pub trait Dependency {
         optimizer_settings: OptimizerSettings,
         include_metadata_hash: bool,
         debug_config: DebugConfig,
-        llvm_arguments: &[String],
     ) -> anyhow::Result<String>;
 
     /// Resolves a full contract path.
@@ -110,7 +116,6 @@ impl Dependency for DummyDependency {
         _optimizer_settings: OptimizerSettings,
         _include_metadata_hash: bool,
         _debug_config: DebugConfig,
-        _llvm_arguments: &[String],
     ) -> anyhow::Result<String> {
         Ok(String::new())
     }

crates/runner/Cargo.toml

@@ -34,4 +34,3 @@ polkadot-sdk.features = [
 
 revive-solidity = { workspace = true, optional = true }
 revive-differential = { workspace = true, optional = true }
-revive-llvm-context = { workspace = true }

crates/runner/src/lib.rs

@@ -85,7 +85,6 @@ impl ExtBuilder {
             .unwrap();
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balance_genesis_config,
-            dev_accounts: None,
         }
         .assimilate_storage(&mut t)
         .unwrap();
@@ -239,6 +238,7 @@ pub enum Code {
     Solidity {
         path: Option<std::path::PathBuf>,
         solc_optimizer: Option<bool>,
+        pipeline: Option<revive_solidity::SolcPipeline>,
         contract: String,
     },
     /// Read the contract blob from disk
@@ -263,6 +263,7 @@ impl From<Code> for pallet_revive::Code {
                 path,
                 contract,
                 solc_optimizer,
+                pipeline,
             } => {
                 let Some(path) = path else {
                     panic!("Solidity source of contract '{contract}' missing path");
@@ -274,7 +275,7 @@ impl From<Code> for pallet_revive::Code {
                     &contract,
                     &source_code,
                     solc_optimizer.unwrap_or(true),
-                    revive_llvm_context::OptimizerSettings::cycles(),
+                    pipeline.unwrap_or(revive_solidity::SolcPipeline::Yul),
                 ))
             }
             Code::Path(path) => pallet_revive::Code::Upload(std::fs::read(path).unwrap()),

crates/runner/src/runtime.rs

@@ -1,4 +1,5 @@
-use frame_support::{runtime, traits::FindAuthor, weights::constants::WEIGHT_REF_TIME_PER_SECOND};
+use frame_support::{runtime, weights::constants::WEIGHT_REF_TIME_PER_SECOND};
+
 use pallet_revive::AccountId32Mapper;
 use polkadot_sdk::*;
 use polkadot_sdk::{
@@ -10,6 +11,8 @@ pub type Balance = u128;
 pub type AccountId = pallet_revive::AccountId32Mapper<Runtime>;
 pub type Block = frame_system::mocking::MockBlock<Runtime>;
 pub type Hash = <Runtime as frame_system::Config>::Hash;
+pub type EventRecord =
+    frame_system::EventRecord<<Runtime as frame_system::Config>::RuntimeEvent, Hash>;
 
 #[runtime]
 mod runtime {
@@ -23,8 +26,7 @@ mod runtime {
         RuntimeHoldReason,
         RuntimeSlashReason,
         RuntimeLockId,
-        RuntimeTask,
-        RuntimeViewFunction
+        RuntimeTask
     )]
     pub struct Runtime;
 
@@ -85,15 +87,6 @@ impl pallet_revive::Config for Runtime {
     type UploadOrigin = EnsureSigned<AccountId32>;
     type InstantiateOrigin = EnsureSigned<AccountId32>;
     type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
+    type Debug = ();
     type ChainId = ConstU64<420_420_420>;
-    type FindAuthor = Self;
-}
-
-impl FindAuthor<<Runtime as frame_system::Config>::AccountId> for Runtime {
-    fn find_author<'a, I>(_digests: I) -> Option<<Runtime as frame_system::Config>::AccountId>
-    where
-        I: 'a + IntoIterator<Item = (frame_support::ConsensusEngineId, &'a [u8])>,
-    {
-        Some([0xff; 32].into())
-    }
 }

crates/runner/src/specs.rs

@@ -106,10 +106,14 @@ impl SpecsAction {
         };
 
         for (key, expected) in storage {
+            let mut key = **key;
+            let mut expected = **expected;
+            key.reverse();
+            expected.reverse();
             actions.push(Self::VerifyStorage {
                 contract: account_pvm.clone(),
-                key: **key,
-                expected: **expected,
+                key,
+                expected,
             });
         }
 
@@ -278,11 +282,17 @@ impl Specs {
                     let Code::Solidity {
                         path: Some(path),
                         solc_optimizer,
+                        pipeline,
                         contract,
                     } = code
                     else {
                         panic!("the differential runner requires Code::Solidity source");
                     };
+                    assert_ne!(
+                        pipeline,
+                        Some(revive_solidity::SolcPipeline::EVMLA),
+                        "yul pipeline must be enabled in differential mode"
+                    );
                     assert!(
                         salt.0.is_none(),
                         "salt is not supported in differential mode"

crates/runtime-api/src/calling_convention.rs

@@ -1,4 +1,10 @@
-use inkwell::{builder::Builder, context::Context, module::Module, values::IntValue};
+use inkwell::{
+    builder::Builder,
+    context::Context,
+    module::Module,
+    types::{BasicType, StructType},
+    values::{BasicValueEnum, PointerValue},
+};
 
 /// Creates a module that sets the PolkaVM minimum stack size to [`size`] if linked in.
 pub fn min_stack_size<'context>(
@@ -15,23 +21,115 @@ pub fn min_stack_size<'context>(
     module
 }
 
-/// Helper for packing two 32 bit integer values into a 64 bit integer value.
-pub fn pack_hi_lo_reg<'ctx>(
+/// Helper for building function calls with stack spilled arguments.
+///   - `pointer`: points to a struct of the packed argument struct type
+///   - `type`: the packed argument struct type
+///   - `arguments`: a correctly ordered list of the struct field values
+pub fn spill<'ctx>(
     builder: &Builder<'ctx>,
-    context: &'ctx Context,
-    hi: IntValue<'ctx>,
-    lo: IntValue<'ctx>,
-    name: &str,
-) -> anyhow::Result<IntValue<'ctx>> {
-    assert_eq!(hi.get_type(), context.i32_type());
-    assert_eq!(lo.get_type(), context.i32_type());
+    pointer: PointerValue<'ctx>,
+    r#type: StructType<'ctx>,
+    arguments: &[BasicValueEnum<'ctx>],
+) -> anyhow::Result<()> {
+    for index in 0..r#type.get_field_types().len() {
+        let field_pointer = builder.build_struct_gep(
+            r#type,
+            pointer,
+            index as u32,
+            &format!("spill_parameter_{}", index),
+        )?;
+        let field_value = arguments
+            .get(index)
+            .ok_or_else(|| anyhow::anyhow!("invalid index {index} for struct type {}", r#type))?;
+        builder.build_store(field_pointer, *field_value)?;
+    }
 
-    let lo_part = builder.build_int_z_extend(lo, context.i64_type(), &format!("{name}_lo_part"))?;
-    let hi_part = builder.build_int_z_extend(hi, context.i64_type(), &format!("{name}_hi_part"))?;
-    let hi_part_shifted = builder.build_left_shift(
-        hi_part,
-        context.i64_type().const_int(32, false),
-        &format!("{name}_hi_part_shifted"),
-    )?;
-    Ok(builder.build_or(hi_part_shifted, lo_part, name)?)
+    Ok(())
+}
+
+/// Returns a packed struct argument type for the `instantiate` API.
+pub fn instantiate(context: &Context) -> StructType {
+    context.struct_type(
+        &[
+            // code_hash_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // ref_time_limit: u64,
+            context.i64_type().as_basic_type_enum(),
+            // proof_size_limit: u64,
+            context.i64_type().as_basic_type_enum(),
+            // deposit_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // value_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // input_data_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // input_data_len: u32,
+            context.i32_type().as_basic_type_enum(),
+            // address_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // output_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // output_len_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // salt_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+        ],
+        false,
+    )
+}
+
+/// Returns a packed struct argument type for the `call` API.
+pub fn call(context: &Context) -> StructType {
+    context.struct_type(
+        &[
+            // flags: u32,
+            context.i32_type().as_basic_type_enum(),
+            // address_ptr:
+            context.i32_type().as_basic_type_enum(),
+            // ref_time_limit: u64,
+            context.i64_type().as_basic_type_enum(),
+            // proof_size_limit: u64,
+            context.i64_type().as_basic_type_enum(),
+            // deposit_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // value_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // input_data_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // input_data_len: u32,
+            context.i32_type().as_basic_type_enum(),
+            // output_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // output_len_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+        ],
+        false,
+    )
+}
+
+/// Returns a packed struct argument type for the `delegate_call` API.
+pub fn delegate_call(context: &Context) -> StructType {
+    context.struct_type(
+        &[
+            // flags: u32,
+            context.i32_type().as_basic_type_enum(),
+            // address_ptr:
+            context.i32_type().as_basic_type_enum(),
+            // ref_time_limit: u64,
+            context.i64_type().as_basic_type_enum(),
+            // proof_size_limit: u64,
+            context.i64_type().as_basic_type_enum(),
+            // deposit_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // input_data_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // input_data_len: u32,
+            context.i32_type().as_basic_type_enum(),
+            // output_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+            // output_len_ptr: u32,
+            context.i32_type().as_basic_type_enum(),
+        ],
+        false,
+    )
 }

crates/runtime-api/src/polkavm_imports.c

@@ -8,23 +8,27 @@
 #define EVM_WORD_SIZE 32
 #define ALIGN(size) ((size + EVM_WORD_SIZE - 1) & ~(EVM_WORD_SIZE - 1))
 #define MAX_MEMORY_SIZE (64 * 1024)
-char __memory[MAX_MEMORY_SIZE];
-uint32_t __memory_size = 0;
+static char __memory[MAX_MEMORY_SIZE];
+static uint32_t __memory_size = 0;
 
-void * __sbrk_internal(uint32_t offset, uint32_t size) {
+void *  __sbrk_internal(uint32_t offset, uint32_t size) {
     if (offset >= MAX_MEMORY_SIZE || size > MAX_MEMORY_SIZE) {
-        POLKAVM_TRAP();
+        return NULL;
     }
 
     uint32_t new_size = ALIGN(offset + size);
     if (new_size > MAX_MEMORY_SIZE) {
-        POLKAVM_TRAP();
+        return NULL;
     }
     if (new_size > __memory_size) {
         __memory_size = new_size;
     }
 
-    return (void *)&__memory[offset];
+    return (void *)&__memory[__memory_size];
+}
+
+uint32_t __msize() {
+    return __memory_size;
 }
 
 void * memset(void *b, int c, size_t len) {
@@ -68,13 +72,11 @@ POLKAVM_IMPORT(void, balance_of, uint32_t, uint32_t)
 
 POLKAVM_IMPORT(void, base_fee, uint32_t)
 
-POLKAVM_IMPORT(void, block_author, uint32_t)
-
 POLKAVM_IMPORT(void, block_hash, uint32_t, uint32_t)
 
 POLKAVM_IMPORT(void, block_number, uint32_t)
 
-POLKAVM_IMPORT(uint64_t, call, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t)
+POLKAVM_IMPORT(uint64_t, call, uint32_t)
 
 POLKAVM_IMPORT(uint64_t, call_data_copy, uint32_t, uint32_t, uint32_t)
 
@@ -90,7 +92,7 @@ POLKAVM_IMPORT(uint64_t, code_size, uint32_t)
 
 POLKAVM_IMPORT(void, code_hash, uint32_t, uint32_t)
 
-POLKAVM_IMPORT(uint64_t, delegate_call, uint64_t, uint64_t, uint64_t, uint32_t, uint64_t, uint64_t)
+POLKAVM_IMPORT(uint64_t, delegate_call, uint32_t)
 
 POLKAVM_IMPORT(void, deposit_event, uint32_t, uint32_t, uint32_t, uint32_t)
 
@@ -104,7 +106,7 @@ POLKAVM_IMPORT(uint64_t, get_storage, uint32_t, uint32_t, uint32_t, uint32_t, ui
 
 POLKAVM_IMPORT(void, hash_keccak_256, uint32_t, uint32_t, uint32_t)
 
-POLKAVM_IMPORT(uint64_t, instantiate, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t)
+POLKAVM_IMPORT(uint64_t, instantiate, uint32_t)
 
 POLKAVM_IMPORT(void, now, uint32_t)
 

crates/runtime-api/src/polkavm_imports.rs

@@ -1,15 +1,19 @@
+//! This crate vendors the [PolkaVM][0] C API and provides a LLVM module for interacting
+//! with the `pallet-revive` runtime API.
+//! At present, the revive pallet requires blobs to export `call` and `deploy`,
+//! and offers a bunch of [runtime API methods][1]. The provided [module] implements
+//! those exports and imports.
+//! [0]: [https://crates.io/crates/polkavm]
+//! [1]: [https://docs.rs/pallet-contracts/26.0.0/pallet_contracts/api_doc/index.html]
+
 use inkwell::{context::Context, memory_buffer::MemoryBuffer, module::Module, support::LLVMString};
 
 include!(concat!(env!("OUT_DIR"), "/polkavm_imports.rs"));
 
-/// The emulated EVM heap memory global symbol.
-pub static MEMORY: &str = "__memory";
-
-/// The emulated EVM heap memory size global symbol.
-pub static MEMORY_SIZE: &str = "__memory_size";
-
 pub static SBRK: &str = "__sbrk_internal";
 
+pub static MEMORY_SIZE: &str = "__msize";
+
 pub static ADDRESS: &str = "address";
 
 pub static BALANCE: &str = "balance";
@@ -18,8 +22,6 @@ pub static BALANCE_OF: &str = "balance_of";
 
 pub static BASE_FEE: &str = "base_fee";
 
-pub static BLOCK_AUTHOR: &str = "block_author";
-
 pub static BLOCK_HASH: &str = "block_hash";
 
 pub static BLOCK_NUMBER: &str = "block_number";
@@ -80,11 +82,11 @@ pub static WEIGHT_TO_FEE: &str = "weight_to_fee";
 /// Useful for configuring common attributes and linkage.
 pub static IMPORTS: [&str; 34] = [
     SBRK,
+    MEMORY_SIZE,
     ADDRESS,
     BALANCE,
     BALANCE_OF,
     BASE_FEE,
-    BLOCK_AUTHOR,
     BLOCK_HASH,
     BLOCK_NUMBER,
     CALL,

crates/solc-json-interface/Cargo.toml

@@ -1,23 +0,0 @@
-[package]
-name = "revive-solc-json-interface"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-description = "Rust bindings for the solc standard JSON and combined JSON interface"
-
-[features]
-default = ["parallel"]
-parallel = ["rayon"]
-resolc = [] # The resolc binary adds a bunch of custom fields to the format
-
-[dependencies]
-revive-common = { workspace = true }
-
-anyhow = { workspace = true }
-rayon = { workspace = true, optional = true }
-semver = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }

crates/solc-json-interface/src/lib.rs

@@ -1,27 +0,0 @@
-//! This crates provides (de)serializable Rust types for interacting
-//! `solc` via the [JSON-input-output][0] interface.
-//!
-//! [0]: https://docs.soliditylang.org/en/latest/using-the-compiler.html#compiler-input-and-output-json-description
-
-pub use self::combined_json::contract::Contract as CombinedJsonContract;
-pub use self::standard_json::input::language::Language as SolcStandardJsonInputLanguage;
-pub use self::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
-pub use self::standard_json::input::settings::metadata_hash::MetadataHash as SolcStandardJsonInputSettingsMetadataHash;
-pub use self::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
-pub use self::standard_json::input::settings::selection::file::flag::Flag as SolcStandardJsonInputSettingsSelectionFileFlag;
-pub use self::standard_json::input::settings::selection::file::File as SolcStandardJsonInputSettingsSelectionFile;
-pub use self::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
-pub use self::standard_json::input::settings::Settings as SolcStandardJsonInputSettings;
-pub use self::standard_json::input::source::Source as SolcStandardJsonInputSource;
-pub use self::standard_json::input::Input as SolcStandardJsonInput;
-pub use self::standard_json::output::contract::evm::bytecode::Bytecode as SolcStandardJsonOutputContractEVMBytecode;
-pub use self::standard_json::output::contract::evm::EVM as SolcStandardJsonOutputContractEVM;
-pub use self::standard_json::output::contract::Contract as SolcStandardJsonOutputContract;
-pub use self::standard_json::output::Output as SolcStandardJsonOutput;
-#[cfg(feature = "resolc")]
-pub use self::warning::Warning as ResolcWarning;
-
-pub mod combined_json;
-pub mod standard_json;
-#[cfg(feature = "resolc")]
-pub mod warning;

crates/solc-json-interface/src/standard_json/input/settings/selection/mod.rs

@@ -1,99 +0,0 @@
-//! The `solc --standard-json` output selection.
-
-pub mod file;
-
-use std::collections::BTreeMap;
-
-use serde::Deserialize;
-use serde::Serialize;
-
-use self::file::File as FileSelection;
-
-/// The `solc --standard-json` output selection.
-#[derive(Debug, Serialize, Deserialize, Default, PartialEq)]
-pub struct Selection {
-    /// Only the 'all' wildcard is available for robustness reasons.
-    #[serde(rename = "*", skip_serializing_if = "Option::is_none")]
-    all: Option<FileSelection>,
-
-    #[serde(skip_serializing_if = "BTreeMap::is_empty", flatten)]
-    pub files: BTreeMap<String, FileSelection>,
-}
-
-impl Selection {
-    /// Creates the selection required by our compilation process.
-    pub fn new_required() -> Self {
-        Self {
-            all: Some(FileSelection::new_required()),
-            files: BTreeMap::new(),
-        }
-    }
-
-    /// Extends the user's output selection with flag required by our compilation process.
-    pub fn extend_with_required(&mut self) -> &mut Self {
-        self.all
-            .get_or_insert_with(FileSelection::new_required)
-            .extend_with_required();
-        for (_, v) in self.files.iter_mut() {
-            v.extend_with_required();
-        }
-        self
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::collections::BTreeMap;
-
-    use crate::SolcStandardJsonInputSettingsSelectionFile;
-
-    use super::Selection;
-
-    #[test]
-    fn per_file() {
-        let init = Selection {
-            all: None,
-            files: BTreeMap::from([(
-                "Test".to_owned(),
-                SolcStandardJsonInputSettingsSelectionFile::new_required(),
-            )]),
-        };
-
-        let deser = serde_json::to_string(&init)
-            .and_then(|string| serde_json::from_str(&string))
-            .unwrap();
-
-        assert_eq!(init, deser)
-    }
-
-    #[test]
-    fn all() {
-        let init = Selection {
-            all: Some(SolcStandardJsonInputSettingsSelectionFile::new_required()),
-            files: BTreeMap::new(),
-        };
-
-        let deser = serde_json::to_string(&init)
-            .and_then(|string| serde_json::from_str(&string))
-            .unwrap();
-
-        assert_eq!(init, deser)
-    }
-
-    #[test]
-    fn all_and_override() {
-        let init = Selection {
-            all: Some(SolcStandardJsonInputSettingsSelectionFile::new_required()),
-            files: BTreeMap::from([(
-                "Test".to_owned(),
-                SolcStandardJsonInputSettingsSelectionFile::new_required(),
-            )]),
-        };
-
-        let deser = serde_json::to_string(&init)
-            .and_then(|string| serde_json::from_str(&string))
-            .unwrap();
-
-        assert_eq!(init, deser)
-    }
-}

crates/solc-json-interface/src/standard_json/mod.rs

@@ -1,4 +0,0 @@
-//! The `solc <input>.sol --standard-json` interface input and output.
-
-pub mod input;
-pub mod output;

crates/solc-json-interface/src/standard_json/output/error/mod.rs

@@ -1,135 +0,0 @@
-//! The `solc --standard-json` output error.
-
-pub mod source_location;
-
-use std::str::FromStr;
-
-use serde::Deserialize;
-use serde::Serialize;
-
-use self::source_location::SourceLocation;
-
-/// The `solc --standard-json` output error.
-#[derive(Debug, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct Error {
-    /// The component type.
-    pub component: String,
-    /// The error code.
-    pub error_code: Option<String>,
-    /// The formatted error message.
-    pub formatted_message: String,
-    /// The non-formatted error message.
-    pub message: String,
-    /// The error severity.
-    pub severity: String,
-    /// The error location data.
-    pub source_location: Option<SourceLocation>,
-    /// The error type.
-    pub r#type: String,
-}
-
-impl Error {
-    /// Returns the `ecrecover` function usage warning.
-    pub fn message_ecrecover(src: Option<&str>) -> Self {
-        let message = r#"
-Warning: It looks like you are using 'ecrecover' to validate a signature of a user account.
-Polkadot comes with native account abstraction support, therefore it is highly recommended NOT
-to rely on the fact that the account has an ECDSA private key attached to it since accounts might
-implement other signature schemes.
-"#
-        .to_owned();
-
-        Self {
-            component: "general".to_owned(),
-            error_code: None,
-            formatted_message: message.clone(),
-            message,
-            severity: "warning".to_owned(),
-            source_location: src.map(SourceLocation::from_str).and_then(Result::ok),
-            r#type: "Warning".to_owned(),
-        }
-    }
-
-    /// Returns the `<address payable>`'s `send` and `transfer` methods usage error.
-    pub fn message_send_and_transfer(src: Option<&str>) -> Self {
-        let message = r#"
-Warning: It looks like you are using '<address payable>.send/transfer(<X>)'.
-Using '<address payable>.send/transfer(<X>)' is deprecated and strongly discouraged!
-The resolc compiler uses a heuristic to detect '<address payable>.send/transfer(<X>)' calls,
-which disables call re-entrancy and supplies all remaining gas instead of the 2300 gas stipend.
-However, detection is not guaranteed. You are advised to carefully test this, employ
-re-entrancy guards or use the withdrawal pattern instead!
-Learn more on https://docs.soliditylang.org/en/latest/security-considerations.html#reentrancy
-and https://docs.soliditylang.org/en/latest/common-patterns.html#withdrawal-from-contracts
-"#
-        .to_owned();
-
-        Self {
-            component: "general".to_owned(),
-            error_code: None,
-            formatted_message: message.clone(),
-            message,
-            severity: "warning".to_owned(),
-            source_location: src.map(SourceLocation::from_str).and_then(Result::ok),
-            r#type: "Warning".to_owned(),
-        }
-    }
-
-    /// Returns the `extcodesize` instruction usage warning.
-    pub fn message_extcodesize(src: Option<&str>) -> Self {
-        let message = r#"
-Warning: Your code or one of its dependencies uses the 'extcodesize' instruction, which is
-usually needed in the following cases:
-  1. To detect whether an address belongs to a smart contract.
-  2. To detect whether the deploy code execution has finished.
-Polkadot comes with native account abstraction support (so smart contracts are just accounts
-coverned by code), and you should avoid differentiating between contracts and non-contract
-addresses.
-"#
-        .to_owned();
-
-        Self {
-            component: "general".to_owned(),
-            error_code: None,
-            formatted_message: message.clone(),
-            message,
-            severity: "warning".to_owned(),
-            source_location: src.map(SourceLocation::from_str).and_then(Result::ok),
-            r#type: "Warning".to_owned(),
-        }
-    }
-
-    /// Returns the `origin` instruction usage warning.
-    pub fn message_tx_origin(src: Option<&str>) -> Self {
-        let message = r#"
-Warning: You are checking for 'tx.origin' in your code, which might lead to unexpected behavior.
-Polkadot comes with native account abstraction support, and therefore the initiator of a
-transaction might be different from the contract calling your code. It is highly recommended NOT
-to rely on tx.origin, but use msg.sender instead.
-"#
-        .to_owned();
-
-        Self {
-            component: "general".to_owned(),
-            error_code: None,
-            formatted_message: message.clone(),
-            message,
-            severity: "warning".to_owned(),
-            source_location: src.map(SourceLocation::from_str).and_then(Result::ok),
-            r#type: "Warning".to_owned(),
-        }
-    }
-
-    /// Appends the contract path to the message..
-    pub fn push_contract_path(&mut self, path: &str) {
-        self.formatted_message
-            .push_str(format!("\n--> {path}\n").as_str());
-    }
-}
-
-impl std::fmt::Display for Error {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.formatted_message)
-    }
-}

crates/solc-json-interface/src/standard_json/output/mod.rs

@@ -1,71 +0,0 @@
-//! The `solc --standard-json` output.
-
-pub mod contract;
-pub mod error;
-pub mod source;
-
-use std::collections::BTreeMap;
-
-use serde::Deserialize;
-use serde::Serialize;
-
-#[cfg(feature = "resolc")]
-use crate::warning::Warning;
-
-use self::contract::Contract;
-use self::error::Error as SolcStandardJsonOutputError;
-use self::source::Source;
-
-/// The `solc --standard-json` output.
-#[derive(Debug, Serialize, Deserialize, Clone, Default)]
-pub struct Output {
-    /// The file-contract hashmap.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub contracts: Option<BTreeMap<String, BTreeMap<String, Contract>>>,
-    /// The source code mapping data.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub sources: Option<BTreeMap<String, Source>>,
-    /// The compilation errors and warnings.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub errors: Option<Vec<SolcStandardJsonOutputError>>,
-    /// The `solc` compiler version.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
-    /// The `solc` compiler long version.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub long_version: Option<String>,
-    /// The `resolc` compiler version.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub revive_version: Option<String>,
-}
-
-impl Output {
-    /// Traverses the AST and returns the list of additional errors and warnings.
-    #[cfg(feature = "resolc")]
-    pub fn preprocess_ast(&mut self, suppressed_warnings: &[Warning]) -> anyhow::Result<()> {
-        let sources = match self.sources.as_ref() {
-            Some(sources) => sources,
-            None => return Ok(()),
-        };
-
-        let mut messages = Vec::new();
-        for (path, source) in sources.iter() {
-            if let Some(ast) = source.ast.as_ref() {
-                let mut polkavm_messages = Source::get_messages(ast, suppressed_warnings);
-                for message in polkavm_messages.iter_mut() {
-                    message.push_contract_path(path.as_str());
-                }
-                messages.extend(polkavm_messages);
-            }
-        }
-        self.errors = match self.errors.take() {
-            Some(mut errors) => {
-                errors.extend(messages);
-                Some(errors)
-            }
-            None => Some(messages),
-        };
-
-        Ok(())
-    }
-}