Skip to content

Commit

Permalink
Merge #78
Browse files Browse the repository at this point in the history
78: using of the asm feature to improve the performance of basic functions r=jbreitbart a=stlankes

-  PR uses rust-lang/compiler-builtins#365 to improve the performance
- fix broken CI and build the bootloader on windows correctly


Co-authored-by: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
  • Loading branch information
bors[bot] and stlankes authored Nov 21, 2020
2 parents 9d0a06d + 353d180 commit d97ee85
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .cargo/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[unstable]
build-std = ["std", "core", "alloc", "panic_abort"]
build-std-features = ["compiler-builtins-mem"]
build-std-features = ["compiler-builtins-mem", "compiler-builtins-asm"]

[build]
target = "x86_64-unknown-hermit"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:


steps:
- uses: hecrj/setup-rust-action@v1.3.1
- uses: hecrj/setup-rust-action@v1
with:
rust-version: ${{ matrix.rust }}
components: ${{ matrix.components || '' }}
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
targets: 'x86_64-unknown-linux-gnu'

steps:
- uses: hecrj/setup-rust-action@v1.3.1
- uses: hecrj/setup-rust-action@v1
with:
rust-version: ${{ matrix.rust }}
components: ${{ matrix.components || '' }}
Expand All @@ -55,10 +55,14 @@ jobs:
brew install qemu nasm
if: ${{ matrix.os == 'macOS-latest' }}
- name: Install qemu/nasm (windows)
uses: crazy-max/ghaction-chocolatey@v1
with:
args: install qemu nasm
if: ${{ matrix.os == 'windows-latest' }}
- name: Set path to qemu/nasm (Windows)
run: |
choco install qemu nasm
echo "::add-path::C:\Program Files\NASM"
echo "::add-path::C:\Program Files\qemu"
echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "C:\Program Files\nasm" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
if: ${{ matrix.os == 'windows-latest' }}
- name: Building dev version
run:
Expand All @@ -71,6 +75,7 @@ jobs:
- name: Build loader (unix)
working-directory: loader
run: make
if: ${{ ( matrix.os == 'macOS-latest' ) || ( matrix.os == 'ubuntu-latest' ) }}
# Workaround since makefile doesn't work when using powershell
- name: Build loader (windows)
working-directory: loader
Expand Down

0 comments on commit d97ee85

Please sign in to comment.