Meson/wren
1
0
Fork 0
forked from Mirror/wren
Code Pull Requests Activity

Give PinnedObject a public name.

Browse Source 
It needs to be public since the macros expand to stack allocations
of it.
This commit is contained in:
Bob Nystrom
2014-04-07 07:47:58 -07:00
parent 289e70ed38
commit 57fa694c36
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wren_vm.c
View File

@ -132,7 +132,7 @@ static void collectGarbage(WrenVM* vm)
}
// Pinned objects.
PinnedObj* pinned = vm->pinned;
WrenPinnedObj* pinned = vm->pinned;
while (pinned != NULL)
{
wrenMarkObj(vm, pinned->obj);
@ -1030,7 +1030,7 @@ int wrenDefineGlobal(WrenVM* vm, const char* name, size_t length, Value value)
return symbol;
}
void wrenPinObj(WrenVM* vm, Obj* obj, PinnedObj* pinned)
void wrenPinObj(WrenVM* vm, Obj* obj, WrenPinnedObj* pinned)
{
pinned->obj = obj;
pinned->previous = vm->pinned;

13
src/wren_vm.h
View File

@ -17,7 +17,7 @@
#define WREN_PIN(vm, obj) \
do \
{ \
PinnedObj WREN_TOKEN_PASTE2(wrenPinned, __LINE__); \
WrenPinnedObj WREN_TOKEN_PASTE2(wrenPinned, __LINE__); \
wrenPinObj(vm, (Obj*)obj, &WREN_TOKEN_PASTE2(wrenPinned, __LINE__)); \
} \
while (false)
@ -189,15 +189,14 @@ typedef enum
// WrenVM has a pointer to the head of the list and walks it if a collection
// occurs. This implies that pinned objects need to have stack semantics: only
// the most recently pinned object can be unpinned.
// TODO: Move into wren_vm.c.
typedef struct sPinnedObj
typedef struct sWrenPinnedObj
{
// The pinned object.
Obj* obj;
// The next pinned object.
struct sPinnedObj* previous;
} PinnedObj;
struct sWrenPinnedObj* previous;
} WrenPinnedObj;
// TODO: Move into wren_vm.c?
struct WrenVM
@ -244,7 +243,7 @@ struct WrenVM
// The head of the list of pinned objects. Will be `NULL` if nothing is
// pinned.
PinnedObj* pinned;
WrenPinnedObj* pinned;
// The externally-provided function used to allocate memory.
WrenReallocateFn reallocate;
@ -305,7 +304,7 @@ void wrenSetCompiler(WrenVM* vm, Compiler* compiler);
// Mark [obj] as a GC root so that it doesn't get collected. Initializes
// [pinned], which must be then passed to [unpinObj]. This is not intended to be
// used directly. Instead, use the [WREN_PIN_OBJ] macro.
void wrenPinObj(WrenVM* vm, Obj* obj, PinnedObj* pinned);
void wrenPinObj(WrenVM* vm, Obj* obj, WrenPinnedObj* pinned);
// Remove the most recently pinned object from the list of pinned GC roots.
// This is not intended to be used directly. Instead, use the [WREN_UNPIN_OBJ]