Changeset ca12383 in mainline


Ignore:
Timestamp:
2010-02-10T23:31:50Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b32c604f
Parents:
e2ae2fc
Message:

update uspace IA64 definitions to be up-to-date with their kernel counterparts

Location:
uspace/lib/libc/arch/ia64/include
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/libc/arch/ia64/include/faddr.h

    re2ae2fc rca12383  
    2727 */
    2828
    29 /** @addtogroup libcia64       
     29/** @addtogroup libcia64
    3030 * @{
    3131 */
    … …  
    3838#include <libarch/types.h>
    3939
    40 /** 
     40/**
    4141 *
    4242 * Calculate absolute address of function
    4343 * referenced by fptr pointer.
    4444 *
    45  * @param f Function pointer.
     45 * @param fptr Function pointer.
    4646 *
    4747 */
    48 #define FADDR(f)         (*((uintptr_t *)(f)));
     48#define FADDR(fptr)  (((fncptr_t *) (fptr))->fnc)
    4949
    5050#endif

  • uspace/lib/libc/arch/ia64/include/fibril.h

    re2ae2fc rca12383  
    106106        uint64_t pr;
    107107
    108         __r128 f2 __attribute__ ((aligned(16)));
    109         __r128 f3;
    110         __r128 f4;
    111         __r128 f5;
     108        uint128_t f2 __attribute__ ((aligned(16)));
     109        uint128_t f3;
     110        uint128_t f4;
     111        uint128_t f5;
    112112
    113         __r128 f16;
    114         __r128 f17;
    115         __r128 f18;
    116         __r128 f19;
    117         __r128 f20;
    118         __r128 f21;
    119         __r128 f22;
    120         __r128 f23;
    121         __r128 f24;
    122         __r128 f25;
    123         __r128 f26;
    124         __r128 f27;
    125         __r128 f28;
    126         __r128 f29;
    127         __r128 f30;
    128         __r128 f31;
     113        uint128_t f16;
     114        uint128_t f17;
     115        uint128_t f18;
     116        uint128_t f19;
     117        uint128_t f20;
     118        uint128_t f21;
     119        uint128_t f22;
     120        uint128_t f23;
     121        uint128_t f24;
     122        uint128_t f25;
     123        uint128_t f26;
     124        uint128_t f27;
     125        uint128_t f28;
     126        uint128_t f29;
     127        uint128_t f30;
     128        uint128_t f31;
    129129
    130130} context_t;

  • uspace/lib/libc/arch/ia64/include/types.h

    re2ae2fc rca12383  
    2727 */
    2828
    29 /** @addtogroup libcia64       
     29/** @addtogroup libcia64
    3030 * @{
    3131 */
    … …  
    5050typedef unsigned long int uint64_t;
    5151
     52typedef struct {
     53        uint64_t lo;
     54        uint64_t hi;
     55} uint128_t;
     56
    5257typedef int64_t ssize_t;
    5358typedef uint64_t size_t;
    … …  
    5560typedef uint64_t uintptr_t;
    5661
    57 typedef unsigned char __r8;                     /* Reserve byte */
    58 typedef unsigned short __r16;
    59 typedef unsigned int __r32;
    60 typedef unsigned long __r64;
    61 
    62 typedef struct __r128{
    63         __r64 lo;
    64         __r64 hi;
    65 } __r128;
     62typedef struct {
     63        uintptr_t fnc;
     64        uintptr_t gp;
     65} __attribute__((may_alias)) fncptr_t;
    6666
    6767#endif
Note: See TracChangeset for help on using the changeset viewer.