Index: uspace/lib/softint/Makefile =================================================================== --- uspace/lib/softint/Makefile (revision 042fbe0c7c1554d67557bfe39825352d0ac29fbe) +++ uspace/lib/softint/Makefile (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) @@ -35,6 +35,8 @@ SOURCES = \ + generic/comparison.c \ generic/division.c \ - generic/multiplication.c + generic/multiplication.c \ + generic/shift.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/softint/generic/comparison.c =================================================================== --- uspace/lib/softint/generic/comparison.c (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) +++ uspace/lib/softint/generic/comparison.c (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2011 Petr Koupy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup softint + * @{ + */ +/** + * @file Signed and unsigned comparisons. + */ + +#include +#include + +#define LESSER 0; +#define EQUAL 1; +#define GREATER 2; + +int __cmpdi2 (long long a, long long b) +{ + union lltype lla; + union lltype llb; + + lla.s_whole = a; + llb.s_whole = b; + + if (lla.s_half[HI] < llb.s_half[HI]) { + return LESSER; + } else if (lla.s_half[HI] > llb.s_half[HI]) { + return GREATER; + } else { + if (lla.u_half[LO] < llb.u_half[LO]) { + return LESSER; + } else if (lla.u_half[LO] > llb.u_half[LO]) { + return GREATER; + } else { + return EQUAL; + } + } +} + +int __ucmpdi2 (unsigned long long a, unsigned long long b) +{ + union lltype lla; + union lltype llb; + + lla.u_whole = a; + llb.u_whole = b; + + if (lla.u_half[HI] < llb.u_half[HI]) { + return LESSER; + } else if (lla.u_half[HI] > llb.u_half[HI]) { + return GREATER; + } else { + if (lla.u_half[LO] < llb.u_half[LO]) { + return LESSER; + } else if (lla.u_half[LO] > llb.u_half[LO]) { + return GREATER; + } else { + return EQUAL; + } + } +} + +/** @} + */ Index: uspace/lib/softint/generic/shift.c =================================================================== --- uspace/lib/softint/generic/shift.c (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) +++ uspace/lib/softint/generic/shift.c (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2011 Petr Koupy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup softint + * @{ + */ +/** + * @file Logical and arithmetic shifts. + */ + +#include +#include + +long long __ashldi3 (long long val, int shift) +{ + union lltype ll; + + ll.s_whole = val; + + if (shift <= 0) { + return ll.s_whole; + } + + if (shift >= (int) WHOLE_BIT_CNT) { + ll.u_half[HI] = 0; + ll.u_half[LO] = 0; + return ll.s_whole; + } + + if (shift >= (int) HALF_BIT_CNT) { + ll.u_half[HI] = ll.u_half[LO] << (shift - HALF_BIT_CNT); + ll.u_half[LO] = 0; + } else { + ll.u_half[HI] <<= shift; + ll.u_half[HI] |= ll.u_half[LO] >> (HALF_BIT_CNT - shift); + ll.u_half[LO] <<= shift; + } + + return ll.s_whole; +} + +long long __ashrdi3 (long long val, int shift) +{ + union lltype ll; + + ll.s_whole = val; + + if (shift <= 0) { + return ll.s_whole; + } + + long fill = ll.s_half[HI] >> (HALF_BIT_CNT - 1); + + if (shift >= (int) WHOLE_BIT_CNT) { + ll.s_half[HI] = fill; + ll.s_half[LO] = fill; + return ll.s_whole; + } + + if (shift >= (int) HALF_BIT_CNT) { + ll.s_half[LO] = ll.s_half[HI] >> (shift - HALF_BIT_CNT); + ll.s_half[HI] = fill; + } else { + ll.u_half[LO] >>= shift; + ll.u_half[LO] |= ll.u_half[HI] << (HALF_BIT_CNT - shift); + ll.s_half[HI] >>= shift; + } + + return ll.s_whole; +} + +long long __lshrdi3 (long long val, int shift) +{ + union lltype ll; + + ll.s_whole = val; + + if (shift <= 0) { + return ll.s_whole; + } + + if (shift >= (int) WHOLE_BIT_CNT) { + ll.u_half[HI] = 0; + ll.u_half[LO] = 0; + return ll.s_whole; + } + + if (shift >= (int) HALF_BIT_CNT) { + ll.u_half[LO] = ll.u_half[HI] >> (shift - HALF_BIT_CNT); + ll.u_half[HI] = 0; + } else { + ll.u_half[LO] >>= shift; + ll.u_half[LO] |= ll.u_half[HI] << (HALF_BIT_CNT - shift); + ll.u_half[HI] >>= shift; + } + + return ll.s_whole; +} + +/** @} + */ Index: uspace/lib/softint/include/comparison.h =================================================================== --- uspace/lib/softint/include/comparison.h (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) +++ uspace/lib/softint/include/comparison.h (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2011 Petr Koupy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup softint + * @{ + */ +/** + * @file Signed and unsigned comparisons. + */ + +#ifndef __SOFTINT_COMPARISON_H__ +#define __SOFTINT_COMPARISON_H__ + +/* Signed comparison (a < b => 0, a == b => 1, a > b => 2). */ +int __cmpdi2 (long long a, long long b); + +/* Unsigned comparison (a < b => 0, a == b => 1, a > b => 2). */ +int __ucmpdi2 (unsigned long long a, unsigned long long b); + +#endif + +/** @} + */ Index: uspace/lib/softint/include/lltype.h =================================================================== --- uspace/lib/softint/include/lltype.h (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) +++ uspace/lib/softint/include/lltype.h (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2011 Petr Koupy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup softint + * @{ + */ +/** + * @file Abstraction over 64-bit integral type to allow simple manipulation. + */ + +#ifndef __SOFTINT_LLTYPE_H__ +#define __SOFTINT_LLTYPE_H__ + +#include + +#define HALF_BIT_CNT (sizeof(int32_t) * sizeof(char)) +#define WHOLE_BIT_CNT (sizeof(int64_t) * sizeof(char)) + +#ifdef __BE__ + #define LO 1 + #define HI 0 +#else + #define LO 0 + #define HI 1 +#endif + +union lltype { + int64_t s_whole; + uint64_t u_whole; + int32_t s_half[2]; + uint32_t u_half[2]; +}; + +#endif + +/** @} + */ Index: uspace/lib/softint/include/shift.h =================================================================== --- uspace/lib/softint/include/shift.h (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) +++ uspace/lib/softint/include/shift.h (revision 2aadf2b583c5b7bd65f939f41f832a34d7050d8a) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2011 Petr Koupy + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup softint + * @{ + */ +/** + * @file Logical and arithmetic shifts. + */ + +#ifndef __SOFTINT_SHIFT_H__ +#define __SOFTINT_SHIFT_H__ + +/* Arithmetic/logical shift left. */ +long long __ashldi3 (long long val, int shift); + +/* Arithmetic shift right. */ +long long __ashrdi3 (long long val, int shift); + +/* Logical shift right. */ +long long __lshrdi3 (long long val, int shift); + +#endif + +/** @} + */