benshi001 updated this revision to Diff 423805. CHANGES SINCE LAST ACTION https://reviews.llvm.org/D123200/new/
https://reviews.llvm.org/D123200 Files: compiler-rt/cmake/Modules/CompilerRTUtils.cmake compiler-rt/cmake/base-config-ix.cmake compiler-rt/cmake/builtin-config-ix.cmake compiler-rt/cmake/config-ix.cmake compiler-rt/lib/builtins/CMakeLists.txt compiler-rt/lib/builtins/avr/exit.S compiler-rt/lib/builtins/avr/mulhi3.S compiler-rt/lib/builtins/avr/mulqi3.S
Index: compiler-rt/lib/builtins/avr/mulqi3.S =================================================================== --- /dev/null +++ compiler-rt/lib/builtins/avr/mulqi3.S @@ -0,0 +1,31 @@ +//===------------ mulhi3.S - int8 multiplication --------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// The corresponding C code is something like: +// +// int __mulqi3(char A, char B) { +// return __mulhi3((int) A, (int) B); +// } +// +//===----------------------------------------------------------------------===// + + .text + .align 2 + + .globl __mulqi3 + .type __mulqi3, @function + +__mulqi3: + mov r25, r24 + lsl r25 + sbc r25, r25 ; Promote A from char to int: `(int) A`. + mov r23, r22 + lsl r23 + sbc r23, r23 ; Promote B from char to int: `(int) B`. + rcall __mulhi3 ; `__mulhi3((int) A, (int) B);`. + ret Index: compiler-rt/lib/builtins/avr/mulhi3.S =================================================================== --- /dev/null +++ compiler-rt/lib/builtins/avr/mulhi3.S @@ -0,0 +1,58 @@ +//===------------ mulhi3.S - int16 multiplication -------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// The corresponding C code is something like: +// +// int __mulhi3(int A, int B) { +// int S = 0; +// while (A != 0) { +// if (A & 1) +// S += B; +// A = ((unsigned int) A) >> 1; +// B <<= 1; +// } +// return S; +// } +// +//===----------------------------------------------------------------------===// + + .text + .align 2 + + .globl __mulhi3 + .type __mulhi3, @function + +__mulhi3: + eor r28, r28 + eor r20, r20 + eor r21, r21 ; Initialize the result to 0: `S = 0;`. + +__mulhi3_loop: + cp r24, r28 + cpc r25, r28 ; `while (A != 0) { ... }` + breq __mulhi3_end ; End the loop if A is 0. + + mov r29, r24 + andi r29, 1 ; `if (A & 1) { ... }` + breq __mulhi3_loop_a ; Omit the accumulation (`S += B;`) if A's LSB is 0. + + add r20, r22 + adc r21, r23 ; Do the accumulation: `S += B;`. + +__mulhi3_loop_a: + lsr r25 + ror r24 ; `A = ((unsigned int) A) >> 1;`. + lsl r22 + rol r23 ; `B <<= 1;` + + rjmp __mulhi3_loop + +__mulhi3_end: + mov r24, r20 + mov r25, r21 + ret Index: compiler-rt/lib/builtins/avr/exit.S =================================================================== --- /dev/null +++ compiler-rt/lib/builtins/avr/exit.S @@ -0,0 +1,18 @@ +//===------------ exit.S - global terminator for AVR ----------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + + .text + .align 2 + + .globl _exit + .type _exit, @function + +_exit: + cli ; Disable all interrupts. +__stop_program: + rjmp __stop_program ; Fall into an infinite loop. Index: compiler-rt/lib/builtins/CMakeLists.txt =================================================================== --- compiler-rt/lib/builtins/CMakeLists.txt +++ compiler-rt/lib/builtins/CMakeLists.txt @@ -668,6 +668,12 @@ ${GENERIC_TF_SOURCES} ${GENERIC_SOURCES}) +set(avr_SOURCES + avr/mulqi3.S + avr/mulhi3.S + avr/exit.S +) + add_custom_target(builtins) set_target_properties(builtins PROPERTIES FOLDER "Compiler-RT Misc") Index: compiler-rt/cmake/config-ix.cmake =================================================================== --- compiler-rt/cmake/config-ix.cmake +++ compiler-rt/cmake/config-ix.cmake @@ -203,8 +203,10 @@ # Detect whether the current target platform is 32-bit or 64-bit, and setup # the correct commandline flags needed to attempt to target 32-bit and 64-bit. +# AVR and MSP430 are omitted since they have 16-bit pointers. if (NOT CMAKE_SIZEOF_VOID_P EQUAL 4 AND - NOT CMAKE_SIZEOF_VOID_P EQUAL 8) + NOT CMAKE_SIZEOF_VOID_P EQUAL 8 AND + NOT ${arch} MATCHES "avr|msp430") message(FATAL_ERROR "Please use architecture with 4 or 8 byte pointers.") endif() Index: compiler-rt/cmake/builtin-config-ix.cmake =================================================================== --- compiler-rt/cmake/builtin-config-ix.cmake +++ compiler-rt/cmake/builtin-config-ix.cmake @@ -52,6 +52,7 @@ set(WASM32 wasm32) set(WASM64 wasm64) set(VE ve) +set(AVR avr) if(APPLE) set(ARM64 arm64 arm64e) @@ -63,7 +64,7 @@ ${X86} ${X86_64} ${ARM32} ${ARM64} ${HEXAGON} ${MIPS32} ${MIPS64} ${PPC32} ${PPC64} ${RISCV32} ${RISCV64} ${SPARC} ${SPARCV9} - ${WASM32} ${WASM64} ${VE}) + ${WASM32} ${WASM64} ${VE} ${AVR}) include(CompilerRTUtils) include(CompilerRTDarwinUtils) Index: compiler-rt/cmake/base-config-ix.cmake =================================================================== --- compiler-rt/cmake/base-config-ix.cmake +++ compiler-rt/cmake/base-config-ix.cmake @@ -248,6 +248,8 @@ test_target_arch(wasm64 "" "--target=wasm64-unknown-unknown") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "ve") test_target_arch(ve "__ve__" "--target=ve-unknown-none") + elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "avr") + test_target_arch(avr "__AVR__" "--target=avr") endif() set(COMPILER_RT_OS_SUFFIX "") endif() Index: compiler-rt/cmake/Modules/CompilerRTUtils.cmake =================================================================== --- compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ compiler-rt/cmake/Modules/CompilerRTUtils.cmake @@ -168,6 +168,7 @@ check_symbol_exists(__wasm32__ "" __WEBASSEMBLY32) check_symbol_exists(__wasm64__ "" __WEBASSEMBLY64) check_symbol_exists(__ve__ "" __VE) + check_symbol_exists(__AVR__ "" __AVR) if(__ARM) add_default_target_arch(arm) elseif(__AARCH64) @@ -212,6 +213,8 @@ add_default_target_arch(wasm64) elseif(__VE) add_default_target_arch(ve) + elseif(__AVR) + add_default_target_arch(avr) endif() endmacro()
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
