msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

GuVariant is now plain uintptr_t instead of a structure to make it easier to write Haskell bindings

Browse Source
This commit is contained in:
kr.angelov
2014-02-09 19:07:15 +00:00
parent d60db9a4c3
commit 7c66e438e1
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/runtime/c/gu/variant.c
View File

@@ -33,11 +33,11 @@ gu_alloc_variant(uint8_t tag, size_t size,
uint8_t* alloc = gu_malloc_aligned(pool, align + size, align); uint8_t* alloc = gu_malloc_aligned(pool, align + size, align);
alloc[align - 1] = tag; alloc[align - 1] = tag;
void* p = &alloc[align]; void* p = &alloc[align];
variant_out->p = (uintptr_t)p; *variant_out = (uintptr_t)p;
return p; return p;
} }
void* p = gu_malloc_aligned(pool, size, align); void* p = gu_malloc_aligned(pool, size, align);
variant_out->p = ((uintptr_t)p) | (tag + 1); *variant_out = ((uintptr_t)p) | (tag + 1);
return p; return p;
} }
@@ -57,9 +57,9 @@ gu_variant_tag(GuVariant variant)
if (gu_variant_is_null(variant)) { if (gu_variant_is_null(variant)) {
return GU_VARIANT_NULL; return GU_VARIANT_NULL;
} }
int u = variant.p % GU_VARIANT_ALIGNMENT; int u = variant % GU_VARIANT_ALIGNMENT;
if (u == 0) { if (u == 0) {
uint8_t* mem = (uint8_t*)variant.p; uint8_t* mem = (uint8_t*)variant;
return mem[-1]; return mem[-1];
} }
return u - 1; return u - 1;
@@ -71,7 +71,7 @@ gu_variant_data(GuVariant variant)
if (gu_variant_is_null(variant)) { if (gu_variant_is_null(variant)) {
return NULL; return NULL;
} }
return (void*)gu_align_backward(variant.p, GU_VARIANT_ALIGNMENT); return (void*)gu_align_backward(variant, GU_VARIANT_ALIGNMENT);
} }
GuVariantInfo gu_variant_open(GuVariant variant) GuVariantInfo gu_variant_open(GuVariant variant)
@@ -88,10 +88,10 @@ GuVariant gu_variant_close(GuVariantInfo info)
GuVariant variant; GuVariant variant;
if (((size_t)info.tag) > GU_VARIANT_ALIGNMENT - 2) { if (((size_t)info.tag) > GU_VARIANT_ALIGNMENT - 2) {
variant.p = (uintptr_t)info.data; variant = (uintptr_t)info.data;
assert(gu_variant_tag(variant) == info.tag); assert(gu_variant_tag(variant) == info.tag);
} else { } else {
variant.p = ((uintptr_t)info.data) | (info.tag + 1); variant = ((uintptr_t)info.data) | (info.tag + 1);
} }
return variant; return variant;
@@ -100,12 +100,12 @@ GuVariant gu_variant_close(GuVariantInfo info)
int int
gu_variant_intval(GuVariant variant) gu_variant_intval(GuVariant variant)
{ {
int u = variant.p % GU_VARIANT_ALIGNMENT; int u = variant % GU_VARIANT_ALIGNMENT;
if (u == 0) { if (u == 0) {
int* mem = (int*)variant.p; int* mem = (int*)variant;
return *mem; return *mem;
} }
return (variant.p / GU_VARIANT_ALIGNMENT); return (variant / GU_VARIANT_ALIGNMENT);
} }
const GuVariant gu_null_variant = { (GuWord) NULL }; const GuVariant gu_null_variant = { (GuWord) NULL };

15
src/runtime/c/gu/variant.h
View File

@@ -33,7 +33,7 @@
* @{ * @{
*/ */
typedef struct GuVariant GuVariant; typedef uintptr_t GuVariant;
void* gu_alloc_variant(uint8_t tag, void* gu_alloc_variant(uint8_t tag,
@@ -84,32 +84,25 @@ struct GuVariantInfo {
GuVariantInfo gu_variant_open(GuVariant variant); GuVariantInfo gu_variant_open(GuVariant variant);
GuVariant gu_variant_close(GuVariantInfo info); GuVariant gu_variant_close(GuVariantInfo info);
/** @privatesection */
struct GuVariant {
uintptr_t p;
/**< @private */
};
/** @} */ /** @} */
static inline void* static inline void*
gu_variant_to_ptr(GuVariant variant) gu_variant_to_ptr(GuVariant variant)
{ {
return (void*)variant.p; return (void*) variant;
} }
static inline GuVariant static inline GuVariant
gu_variant_from_ptr(const void* p) gu_variant_from_ptr(const void* p)
{ {
GuVariant v = { (uintptr_t)p }; return (uintptr_t) p;
return v;
} }
extern const GuVariant gu_null_variant; extern const GuVariant gu_null_variant;
static inline bool static inline bool
gu_variant_is_null(GuVariant v) { gu_variant_is_null(GuVariant v) {
return ((void*)v.p == NULL); return ((void*)v == NULL);
} }

2
src/runtime/c/pgf/data.h
View File

@@ -159,7 +159,7 @@ typedef struct PgfItem PgfItem;
typedef GuMap PgfCallbacksMap; typedef GuMap PgfCallbacksMap;
extern GU_DECLARE_TYPE(PgfCallbacksMap, GuMap); extern GU_DECLARE_TYPE(PgfCallbacksMap, GuMap);
typedef struct GuVariant PgfSymbol; typedef GuVariant PgfSymbol;
typedef enum { typedef enum {
PGF_SYMBOL_CAT, PGF_SYMBOL_CAT,