Changeset 8f4bc1f in mainline


Ignore:
Timestamp:
2009-06-03T05:36:30Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8658f89
Parents:
770971c
Message:

rename the macro to be consistent with LOWER32/UPPER32 and add 64b typecast
(how much fun with a single macro :))

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/macros.h

    r770971c r8f4bc1f  
    8787#define UPPER32(arg)  (((arg) >> 32) & 0xffffffff)
    8888
    89 #define MERGE_LOHI32(lo, hi) \
    90     (((lo) & 0xffffffff) | (((hi) & 0xffffffff) << 32))
     89#define MERGE_LOUP32(lo, up) \
     90        ((((uint64_t) (lo)) & 0xffffffff) \
     91            | ((((uint64_t) (up)) & 0xffffffff) << 32))
    9192
    9293/** Pseudorandom generator
Note: See TracChangeset for help on using the changeset viewer.