i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libroot/riscv64: Fix build. Add MIT optimized bswap from rv8

Browse Source 
Change-Id: I4d0e1ec34d1568594cac0f7378f87852c997ab81
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2166
Reviewed-by: Alex von Gluck IV <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2020-01-28 11:48:42 +00:00
committed by Adrien Destugues
parent 15fb7d88e9
commit 3a85d802ee
2 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/os/arch/riscv64/Jamfile
+2
View File
@@ -13,6 +13,8 @@ for architectureObject in [ MultiArchSubDirSetup riscv64 ] {
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
MergeObject <$(architecture)>os_arch_$(TARGET_ARCH).o :
byteorder.S
stack_frame.c
system_time.c
src/system/libroot/os/arch/riscv64/byteorder.S
+51 -17
View File
@@ -1,30 +1,41 @@
/*
* Copyright 2009, Johannes Wischert. All rights reserved.
* Copyright 2018-2020, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Optimized byteswap functions from the rv8 test
* suite licensed under the MIT License
* https://github.com/rv8-io/rv8/tree/master/src/test
*
*/
#include <asm_defs.h>
.text
/*
* These aren't needed on gcc4+
* uint16 __swap_int16(uint16 value)
* uint32 __swap_int32(uint32 value)
* uint64 __swap_int64(uint64 value)
*/
/* TODO: The following functions can surely be optimized. A simple optimization
* would be to define macros with the contents of the __swap_int{32,64}
* functions and use those instead of calling the functions.
*/
/* float __swap_float(float value)
*/
FUNCTION(__swap_float):
// Assumes single precision
b __swap_int32
//rts
1: auipc a4, %pcrel_hi(__bswap64_c1)
ld a4, %pcrel_lo(1b)(a4)
slli a5, a0, 8
and a5, a5, a4
srli a0, a0, 8
srli a4, a4, 8
and a0, a0, a4
or a5, a5, a0
1: auipc a4, %pcrel_hi(__bswap64_c2)
ld a4, %pcrel_lo(1b)(a4)
slli a0, a5, 16
and a0, a0, a4
srli a5, a5, 16
srli a4, a4, 16
and a5, a5, a4
or a5, a5, a0
slli a0, a5, 32
srli a5, a5, 32
or a0, a0, a5
ret
FUNCTION_END(__swap_float)
@@ -32,7 +43,30 @@ FUNCTION_END(__swap_float)
*/
FUNCTION(__swap_double):
// Assumes double is int64 on RV64
b __swap_int64
//rts
1: auipc a4, %pcrel_hi(__bswap64_c1)
ld a4, %pcrel_lo(1b)(a4)
slli a5, a0, 8
and a5, a5, a4
srli a0, a0, 8
srli a4, a4, 8
and a0, a0, a4
or a5, a5, a0
1: auipc a4, %pcrel_hi(__bswap64_c2)
ld a4, %pcrel_lo(1b)(a4)
slli a0, a5, 16
and a0, a0, a4
srli a5, a5, 16
srli a4, a4, 16
and a5, a5, a4
or a5, a5, a0
slli a0, a5, 32
srli a5, a5, 32
or a0, a0, a5
ret
FUNCTION_END(__swap_double)
.section .rodata
__bswap32_c1: .4byte 0xFF00FF00ULL
__bswap64_c1: .8byte 0xFF00FF00FF00FF00ULL
__bswap64_c2: .8byte 0xFFFF0000FFFF0000ULL