Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove __aeabi_uldivmod stub #779

Open
wants to merge 2 commits into
base: rust
Choose a base branch
from
Open

Remove __aeabi_uldivmod stub #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d98d37
rust: make compiler-builtin stubs non-global
nbdd0121 May 26, 2022
17ea967
rust: replace `__aeabi_uldivmod` stub with actual implementation
nbdd0121 Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions rust/Makefile
View file
Open in desktop
Expand Up @@ -392,8 +392,29 @@ rust-analyzer:
$(Q)$(srctree)/scripts/generate_rust_analyzer.py $(srctree) $(objtree) \
$(RUST_LIB_SRC) > $(objtree)/rust-project.json

redirect-intrinsics = \
__eqsf2 __gesf2 __lesf2 __nesf2 __unordsf2 \
__unorddf2 \
__muloti4 __multi3 \
__udivmodti4 __udivti3 __umodti3

ifneq ($(or $(CONFIG_ARM64),$(and $(CONFIG_RISCV),$(CONFIG_64BIT))),)
# These intrinsics are defined for ARM64 and RISCV64
redirect-intrinsics += \
__ashrti3 \
__ashlti3 __lshrti3
endif

ifdef CONFIG_ARM
redirect-intrinsics += \
__aeabi_fcmpeq __aeabi_fcmpun \
__aeabi_dcmpun \
__aeabi_uldivmod
endif

$(obj)/core.o: private skip_clippy = 1
$(obj)/core.o: private skip_flags = -Dunreachable_pub
$(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym))
$(obj)/core.o: private rustc_target_flags = $(core-cfgs)
$(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs $(obj)/target.json FORCE
$(call if_changed_dep,rustc_library)
Expand Down
27 changes: 23 additions & 4 deletions rust/compiler_builtins.rs
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@
//! [`compiler-rt`]: https://compiler-rt.llvm.org/

#![feature(compiler_builtins)]
#![feature(naked_functions)]
#![compiler_builtins]
#![no_builtins]
#![no_std]
Expand All @@ -28,7 +29,7 @@ macro_rules! define_panicking_intrinsics(
($reason: tt, { $($ident: ident, )* }) => {
$(
#[doc(hidden)]
#[no_mangle]
#[export_name = concat!("__rust", stringify!($ident))]
pub extern "C" fn $ident() {
panic!($reason);
}
Expand Down Expand Up @@ -74,6 +75,24 @@ define_panicking_intrinsics!("`f64` should not be used", {
});

#[cfg(target_arch = "arm")]
define_panicking_intrinsics!("`u64` division/modulo should not be used", {
__aeabi_uldivmod,
});
#[doc(hidden)]
#[naked]
#[no_mangle]
pub unsafe extern "C" fn __rust__aeabi_uldivmod() {
// Adapted from compiler-rt:
// https://github.com/llvm/llvm-project/blob/a80e65e00ada7a9c16acf17a5fd40b4f12ced3a8/compiler-rt/lib/builtins/arm/aeabi_uldivmod.S
unsafe {
core::arch::asm!(
"push {{r6, lr}}",
"sub sp, sp, #16",
"add r6, sp, #8",
"str r6, [sp]",
"bl div64_u64_rem",
"ldr r2, [sp, #8]",
"ldr r3, [sp, #12]",
"add sp, sp, #16",
"pop {{r6, pc}}",
options(noreturn)
);
}
}