Changeset 41455a22 in mainline for uspace/lib/softint


Ignore:
Timestamp:
2012-04-07T17:56:35Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
44c1a48, f3378ba
Parents:
6bb169b5 (diff), 88d5c1e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge GCC 4.7.0 bump and related changes

Location:
uspace/lib/softint
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/softint/generic/division.c

    r6bb169b5 r41455a22  
    3737#include <division.h>
    3838
    39 #define ABSVAL(x) ( (x) > 0 ? (x) : -(x))
    40 #define SGN(x) ( (x) >= 0 ? 1 : 0 )
    41                                      
    42 static unsigned int divandmod32(unsigned int a, unsigned int b, unsigned int *remainder)
     39#define ABSVAL(x)  ((x) > 0 ? (x) : -(x))
     40#define SGN(x)     ((x) >= 0 ? 1 : 0)
     41
     42static unsigned int divandmod32(unsigned int a, unsigned int b,
     43    unsigned int *remainder)
    4344{
    4445        unsigned int result;
    … …  
    5354        }
    5455       
    55         if ( a < b) {
     56        if (a < b) {
    5657                *remainder = a;
    5758                return 0;
    5859        }
    59 
    60         for ( ; steps > 0; steps--) {
     60       
     61        for (; steps > 0; steps--) {
    6162                /* shift one bit to remainder */
    62                 *remainder = ( (*remainder) << 1) | (( a >> 31) & 0x1);
     63                *remainder = ((*remainder) << 1) | (( a >> 31) & 0x1);
    6364                result <<= 1;
    6465               
    6566                if (*remainder >= b) {
    66                                 *remainder -= b;
    67                                 result |= 0x1;
     67                        *remainder -= b;
     68                        result |= 0x1;
    6869                }
    6970                a <<= 1;
    7071        }
    71 
     72       
    7273        return result;
    7374}
    7475
    75 
    76 static unsigned long long divandmod64(unsigned long long a, unsigned long long b, unsigned long long *remainder)
     76static unsigned long long divandmod64(unsigned long long a,
     77    unsigned long long b, unsigned long long *remainder)
    7778{
    7879        unsigned long long result;
    79         int steps = sizeof(unsigned long long) * 8; 
     80        int steps = sizeof(unsigned long long) * 8;
    8081       
    8182        *remainder = 0;
    … …  
    8788        }
    8889       
    89         if ( a < b) {
     90        if (a < b) {
    9091                *remainder = a;
    9192                return 0;
    9293        }
    93 
    94         for ( ; steps > 0; steps--) {
     94       
     95        for (; steps > 0; steps--) {
    9596                /* shift one bit to remainder */
    96                 *remainder = ( (*remainder) << 1) | ((a >> 63) & 0x1);
     97                *remainder = ((*remainder) << 1) | ((a >> 63) & 0x1);
    9798                result <<= 1;
    9899               
    99100                if (*remainder >= b) {
    100                                 *remainder -= b;
    101                                 result |= 0x1;
     101                        *remainder -= b;
     102                        result |= 0x1;
    102103                }
    103104                a <<= 1;
    104105        }
    105 
     106       
    106107        return result;
    107108}
    108109
    109110/* 32bit integer division */
    110 int __divsi3(int a, int b) 
    111 {
    112         unsigned int rem;
    113         int result;
    114        
    115         result = (int)divandmod32(ABSVAL(a), ABSVAL(b), &rem);
    116 
    117         if ( SGN(a) == SGN(b)) return result;
     111int __divsi3(int a, int b)
     112{
     113        unsigned int rem;
     114        int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem);
     115       
     116        if (SGN(a) == SGN(b))
     117                return result;
     118       
    118119        return -result;
    119120}
    120121
    121122/* 64bit integer division */
    122 long long __divdi3(long long a, long long b) 
    123 {
    124         unsigned long long rem;
    125         long long result;
    126        
    127         result = (long long)divandmod64(ABSVAL(a), ABSVAL(b), &rem);
    128 
    129         if ( SGN(a) == SGN(b)) return result;
     123long long __divdi3(long long a, long long b)
     124{
     125        unsigned long long rem;
     126        long long result = (long long) divandmod64(ABSVAL(a), ABSVAL(b), &rem);
     127       
     128        if (SGN(a) == SGN(b))
     129                return result;
     130       
    130131        return -result;
    131132}
    … …  
    141142unsigned long long __udivdi3(unsigned long long a, unsigned long long b)
    142143{
    143         unsigned long long  rem;
     144        unsigned long long rem;
    144145        return divandmod64(a, b, &rem);
    145146}
    … …  
    152153       
    153154        /* if divident is negative, remainder must be too */
    154         if (!(SGN(a))) {
    155                 return -((int)rem);
    156         }
    157        
    158         return (int)rem;
     155        if (!(SGN(a)))
     156                return -((int) rem);
     157       
     158        return (int) rem;
    159159}
    160160
    161161/* 64bit remainder of the signed division */
    162 long long __moddi3(long long a,long long b)
     162long long __moddi3(long long a, long long b)
    163163{
    164164        unsigned long long rem;
    … …  
    166166       
    167167        /* if divident is negative, remainder must be too */
    168         if (!(SGN(a))) {
    169                 return -((long long)rem);
    170         }
    171        
    172         return (long long)rem;
     168        if (!(SGN(a)))
     169                return -((long long) rem);
     170       
     171        return (long long) rem;
    173172}
    174173
    … …  
    189188}
    190189
    191 unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, unsigned long long *c)
     190int __divmodsi3(int a, int b, int *c)
     191{
     192        unsigned int rem;
     193        int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem);
     194       
     195        if (SGN(a) == SGN(b)) {
     196                *c = rem;
     197                return result;
     198        }
     199       
     200        *c = -rem;
     201        return -result;
     202}
     203
     204unsigned int __udivmodsi3(unsigned int a, unsigned int b,
     205    unsigned int *c)
     206{
     207        return divandmod32(a, b, c);
     208}
     209
     210long long __divmoddi3(long long a, long long b, long long *c)
     211{
     212        unsigned long long rem;
     213        long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem);
     214       
     215        if (SGN(a) == SGN(b)) {
     216                *c = rem;
     217                return result;
     218        }
     219       
     220        *c = -rem;
     221        return -result;
     222}
     223
     224unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b,
     225    unsigned long long *c)
    192226{
    193227        return divandmod64(a, b, c);

  • uspace/lib/softint/include/comparison.h

    r6bb169b5 r41455a22  
    3838
    3939/* Signed comparison (a < b => 0, a == b => 1, a > b => 2). */
    40 int __cmpdi2 (long long a, long long b);
     40extern int __cmpdi2(long long, long long);
    4141
    4242/* Unsigned comparison (a < b => 0, a == b => 1, a > b => 2). */
    43 int __ucmpdi2 (unsigned long long a, unsigned long long b);
     43extern int __ucmpdi2(unsigned long long, unsigned long long);
    4444
    4545#endif

  • uspace/lib/softint/include/division.h

    r6bb169b5 r41455a22  
    2929/** @addtogroup softint
    3030 * @{
    31  */ 
     31 */
    3232/**
    3333 * @file
    … …  
    3737#define __SOFTINT_DIVISION_H__
    3838
     39extern int __divsi3(int, int);
     40extern long long __divdi3(long long, long long);
    3941
    40 /* 32bit integer division */
    41 int __divsi3(int a, int b);
     42extern unsigned int __udivsi3(unsigned int, unsigned int);
     43extern unsigned long long __udivdi3(unsigned long long, unsigned long long);
    4244
    43 /* 64bit integer division */
    44 long long __divdi3(long long a, long long b);
     45extern int __modsi3(int, int);
     46extern long long __moddi3(long long, long long);
    4547
    46 /* 32bit unsigned integer division */
    47 unsigned int __udivsi3(unsigned int a, unsigned int b);
     48extern unsigned int __umodsi3(unsigned int, unsigned int);
     49extern unsigned long long __umoddi3(unsigned long long, unsigned long long);
    4850
    49 /* 64bit unsigned integer division */
    50 unsigned long long __udivdi3(unsigned long long a, unsigned long long b);
     51extern int __divmodsi3(int, int, int *);
     52extern unsigned int __udivmodsi3(unsigned int, unsigned int, unsigned int *);
    5153
    52 /* 32bit remainder of the signed division */
    53 int __modsi3(int a, int b);
    54 
    55 /* 64bit remainder of the signed division */
    56 long long __moddi3(long long a, long long b);
    57 
    58 /* 32bit remainder of the unsigned division */
    59 unsigned int __umodsi3(unsigned int a, unsigned int b);
    60 
    61 /* 64bit remainder of the unsigned division */
    62 unsigned long long __umoddi3(unsigned long long a, unsigned long long b);
    63 
    64 unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, unsigned long long *c);
     54extern long long __divmoddi3(long long, long long, long long *);
     55extern unsigned long long __udivmoddi3(unsigned long long, unsigned long long,
     56    unsigned long long *);
    6557
    6658#endif
    … …  
    6860/** @}
    6961 */
    70 

  • uspace/lib/softint/include/lltype.h

    r6bb169b5 r41455a22  
    3939#include <stdint.h>
    4040
    41 #define HALF_BIT_CNT (sizeof(int32_t) * sizeof(char))
    42 #define WHOLE_BIT_CNT (sizeof(int64_t) * sizeof(char))
     41#define HALF_BIT_CNT   (sizeof(int32_t) * sizeof(char))
     42#define WHOLE_BIT_CNT  (sizeof(int64_t) * sizeof(char))
    4343
    4444#ifdef __BE__

  • uspace/lib/softint/include/multiplication.h

    r6bb169b5 r41455a22  
    2929/** @addtogroup softint
    3030 * @{
    31  */ 
     31 */
    3232/**
    3333 * @file
    … …  
    3838
    3939/* 64 bit multiplication */
    40 long long __muldi3(long long a, long long b);
     40extern long long __muldi3(long long, long long);
    4141
    4242#endif

  • uspace/lib/softint/include/shift.h

    r6bb169b5 r41455a22  
    3838
    3939/* Arithmetic/logical shift left. */
    40 long long __ashldi3 (long long val, int shift);
     40extern long long __ashldi3(long long, int);
    4141
    4242/* Arithmetic shift right. */
    43 long long __ashrdi3 (long long val, int shift);
     43extern long long __ashrdi3(long long, int);
    4444
    4545/* Logical shift right. */
    46 long long __lshrdi3 (long long val, int shift);
     46extern long long __lshrdi3(long long, int);
    4747
    4848#endif
Note: See TracChangeset for help on using the changeset viewer.