Ignore:
Timestamp:
Jul 24, 2017, 4:30:00 PM (5 years ago)
Author:
max@…
Message:

Use local_cxy for GET_PTR, instead of the triple map. This fixes a number
of inconsistencies.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/hal/x86_64/core/hal_types.h

    r226 r272  
    204204#define PTR_SHIFT              36
    205205#define GET_CXY(xp)            ((cxy_t)(((xp) & CXY_MASK) >> PTR_SHIFT))
    206 #define GET_PTR(xp)            ((void*)(HAL_VA_LOCAL_CLUSTER | ((xp) & PTR_MASK)))
     206
     207#define GET_PTR(xp)            ((void *)((uint64_t)HAL_VA_BASE | \
     208                                ((uint64_t)(local_cxy) << PTR_SHIFT) | \
     209                                (((uint64_t)(xp)) & PTR_MASK)))
     210
    207211#define XPTR(cxy,ptr)          ((uint64_t)HAL_VA_BASE | \
    208212                                ((uint64_t)(cxy) << PTR_SHIFT) | \
Note: See TracChangeset for help on using the changeset viewer.