From adbb1683435963750f95ee71c3afed4f22edc729 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 4 Jul 2023 11:06:38 +0800 Subject: [PATCH] strip out vestiges of unused assembly code in kernel package --- xous-rs/assemble.ps1 | 19 ------- xous-rs/assemble.sh | 55 --------------------- xous-rs/bin/riscv32i-unknown-none-elf.a | Bin 2720 -> 0 bytes xous-rs/bin/riscv32imac-unknown-none-elf.a | Bin 2728 -> 0 bytes xous-rs/bin/riscv32imac-unknown-xous-elf.a | Bin 2728 -> 0 bytes xous-rs/bin/riscv32imc-unknown-none-elf.a | Bin 2728 -> 0 bytes xous-rs/bin/riscv64gc-unknown-none-elf.a | Bin 3980 -> 0 bytes xous-rs/bin/riscv64imac-unknown-none-elf.a | Bin 3980 -> 0 bytes xous-rs/build.rs | 12 ----- xous-rs/src/arch/riscv/mod.rs | 6 ++- 10 files changed, 5 insertions(+), 87 deletions(-) delete mode 100644 xous-rs/assemble.ps1 delete mode 100755 xous-rs/assemble.sh delete mode 100644 xous-rs/bin/riscv32i-unknown-none-elf.a delete mode 100644 xous-rs/bin/riscv32imac-unknown-none-elf.a delete mode 100644 xous-rs/bin/riscv32imac-unknown-xous-elf.a delete mode 100644 xous-rs/bin/riscv32imc-unknown-none-elf.a delete mode 100644 xous-rs/bin/riscv64gc-unknown-none-elf.a delete mode 100644 xous-rs/bin/riscv64imac-unknown-none-elf.a diff --git a/xous-rs/assemble.ps1 b/xous-rs/assemble.ps1 deleted file mode 100644 index c2fda062d..000000000 --- a/xous-rs/assemble.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -# remove existing blobs because otherwise this will append object files to the old blobs -New-Item -Type Directory -Name bin -Force | Out-Null -Remove-Item -Force bin/*.a | Out-Null - -$crate = "xous" - -riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/asm.S -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-xous.a bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o - -riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/asm.S -DSKIP_MULTICORE -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o - -riscv64-unknown-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac src/asm.S -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o - -Remove-Item bin/$crate.o diff --git a/xous-rs/assemble.sh b/xous-rs/assemble.sh deleted file mode 100755 index 55bdb58d3..000000000 --- a/xous-rs/assemble.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2020 Sean Cross -# SPDX-FileCopyrightText: 2023 Foundation Devices, Inc -# SPDX-License-Identifier: Apache-2.0 - -set -euxo pipefail - -crate=xous-kernel - -usage() { - echo "Usage: $0 [-a riscv]" - exit 1 -} - -while getopts "a:" o; do - case "${o}" in - a) - arch=$OPTARG - ;; - *) - usage - ;; - esac -done - -arch=${arch:-riscv} - -mkdir -p bin - -case $arch in - riscv) - # Remove existing blobs because otherwise this will append object - # files to the old blobs - rm -f bin/riscv*.a - - riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/arch/riscv/asm.S -o bin/$crate.o - ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o - ar crs bin/riscv32imac-unknown-xous-elf.a bin/$crate.o - ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o - - riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/arch/riscv/asm.S -DSKIP_MULTICORE -o bin/$crate.o - ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o - - riscv-none-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac src/arch/riscv/asm.S -o bin/$crate.o - ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o - ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o - ;; - - default) - usage - ;; -esac - -rm bin/$crate.o diff --git a/xous-rs/bin/riscv32i-unknown-none-elf.a b/xous-rs/bin/riscv32i-unknown-none-elf.a deleted file mode 100644 index 375cab9f434c826650666f935ce06952459db43c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2720 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 diff --git a/xous-rs/bin/riscv64imac-unknown-none-elf.a b/xous-rs/bin/riscv64imac-unknown-none-elf.a deleted file mode 100644 index a31bf4b253388b95b1139e32f7de29b7ace65855..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3980 zcmb_e&u`pR5Pn`Kp$Tm^Nr3|8$CeG{hgv&HL&%|^EfVEGKtP2!!N%)2$*P;(V0+V4 z90<8k2_Xdz+>lU(5JHFpe*xkzsQ42&^@!kt#D)3nnceZr`as1<>o@P4Z|2RLH-6r8 zmxDOmetF8T6=gw9b6r1cwUt#NtWOzZT>9OTUvt0LPnyZiBn&zoQlzsztZ zC?$wYNnmS0q35ibF$rmhuhhS}ZR)pwHuZ0RHTCa)GxhI(H}xO>H1!`VPW`7j=kTCv z{-_=vd`awabHaEuI*#+t^eGI8Nk3AatdN>Xh4gAR%d&CITmj;Al`~@^y2G23VrcLyX%L&jmXc+8}?$>;>09z=;P@9>@ZA_?0DDsIZqMC zjdKE<$TEil!IlT&95__GGqcWI)tx>&{q*$dakgEcG2dwxV&GAx6jSl@RQ~gZUVHQ1 z+LddyCGXOzx$-Qnm2b>>g4FSNZ)Lf?w7b~cS=wD_2GBy%$}$?_Zm|LbgUdS{0Iay# zt58Jq8Wt*<5yrA-IiA~xv4lS{gbH!Ey$4p|PY;k>5qz!$f2ah1v;;?mwMhJ@G)TJO z=Sy%Lnik=spS0w-T?L6hVHP!+bm2Ej@T((nr`Ybyam{@eTjH0WW8t+S?>wKAC2>xg z2Q7>6?L0wq4c`Cb;_@oC#Wlz4299g&?#Vq}b3D(Se<~-aCo-8C@xGiX!JlW`K6f*} zZ@jgITJh6SoRxk^D5mrsPDJ%jGyyu>)}IJxrxz0Nq+ z*HsoA>udhoim$s$aPW1U_Y_~>tb&8DI?gAGUu7MG;Na^xpE3ve&#;a`aPW1U z&zS@MEbABq2Vckef;r&pJ6Le=bsRZ6^ylO3i$V4XT;I*&TOs^m5Lx722VZoU#25Hk z04&H40{pQ|%O4Z01IIfrB73ygl^o`Y_=u2c6dd=0=$Y9|ZtkQ(%Xmo|=i|0$X|$gj zZzD(pU-)eT+-H2=hy-7|5Lc6=!6GG5x#nE2D9K=C)E25Zrh};{0 zVZ9(t<94f`lJS2K)EKpsI!ed}EB1E;_0)2XCh*6faV=dvQ98IR$a9$=8mF z__F?2m?*Ki7s!ThT|;r8&Tv8Q@`mwFf+zhiJ%W1~G37odHIp%3XiWefWqldnAzXA# zeTzZ#qZXU{1{p`?|2HRk#Lmbc_q3h=2ZY%%;j+)5{x$)(xgU zH!A;IeCe-)M1uTruiN<_5Qe4fb$;RXQC}^Rzl@)ek$P`ebD+=hxj$za#7|(%?RNsU s27^c3*tnzX^t1EFHtpUg$lT$N_GL_z*z4nd9p!(Q>-V+tg=+i%3;eJBwEzGB diff --git a/xous-rs/build.rs b/xous-rs/build.rs index 0e1ebcfd5..d071d8c54 100644 --- a/xous-rs/build.rs +++ b/xous-rs/build.rs @@ -8,17 +8,5 @@ fn main() { let target = env::var("TARGET").unwrap(); let name = env::var("CARGO_PKG_NAME").unwrap(); - if target.starts_with("riscv") { - fs::copy( - format!("bin/{}.a", target), - out_dir.join(format!("lib{}.a", name)), - ) - .expect("couldn't find asm support library for target platform"); - - println!("cargo:rustc-link-lib=static={}", name); - println!("cargo:rustc-link-search={}", out_dir.display()); - println!("cargo:rerun-if-changed=bin/{}.a", target); - } - println!("cargo:rerun-if-changed=build.rs"); } diff --git a/xous-rs/src/arch/riscv/mod.rs b/xous-rs/src/arch/riscv/mod.rs index 48a2e2a1a..1c0b0e748 100644 --- a/xous-rs/src/arch/riscv/mod.rs +++ b/xous-rs/src/arch/riscv/mod.rs @@ -321,5 +321,9 @@ extern "C" { } pub fn cache_flush() { - unsafe { riscv_cache_flush() }; + unsafe { + asm!( + "fence" + ) + }; }