gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the pointer functions to correctly check the flags.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35916 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Chisnall 2012-12-22 16:21:55 +00:00
parent c8d2192a54
commit d8a6e9def1
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/NSConcretePointerFunctions.h
View file

@ -89,6 +89,11 @@ typedef struct
} PFInfo;
inline static BOOL memoryType(int options, int flag)
{
return (options & 0xff) == flag;
}
/* Declare the concrete pointer functions class as a wrapper around
* an instance of the PFInfo structure.
*/
@ -108,11 +113,11 @@ typedef struct
*/
static inline void *pointerFunctionsRead(PFInfo *PF, void **addr)
{
if (PF->options & NSPointerFunctionsWeakMemory)
if (memoryType(PF->options, NSPointerFunctionsWeakMemory))
{
return ARC_WEAK_READ((id*)addr);
}
else if (PF->options & NSPointerFunctionsZeroingWeakMemory)
if (memoryType(PF->options, NSPointerFunctionsZeroingWeakMemory))
{
return WEAK_READ((id*)addr);
}
@ -124,15 +129,15 @@ static inline void *pointerFunctionsRead(PFInfo *PF, void **addr)
*/
static inline void pointerFunctionsAssign(PFInfo *PF, void **addr, void *value)
{
if (PF->options & NSPointerFunctionsWeakMemory)
if (memoryType(PF->options, NSPointerFunctionsWeakMemory))
{
ARC_WEAK_WRITE(addr, value);
}
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
else if (memoryType(PF->options, NSPointerFunctionsZeroingWeakMemory))
{
WEAK_WRITE(addr, value);
}
else if (PF->options & NSPointerFunctionsStrongMemory)
else if (memoryType(PF->options, NSPointerFunctionsStrongMemory))
{
STRONG_WRITE(addr, value);
}
@ -211,8 +216,10 @@ pointerFunctionsRelinquish(PFInfo *PF, void **itemptr)
if (PF->relinquishFunction != 0)
(*PF->relinquishFunction)(*itemptr, PF->sizeFunction);
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
GSAssignZeroingWeakPointer(itemptr, (void*)0);
if (memoryType(PF->options, NSPointerFunctionsWeakMemory))
ARC_WEAK_WRITE(itemptr, 0);
else if (memoryType(PF->options, NSPointerFunctionsZeroingWeakMemory))
WEAK_WRITE(itemptr, (void*)0);
else
*itemptr = 0;
}
@ -228,8 +235,10 @@ pointerFunctionsReplace(PFInfo *PF, void **dst, void *src)
PF->options & NSPointerFunctionsCopyIn ? YES : NO);
if (PF->relinquishFunction != 0)
(*PF->relinquishFunction)(*dst, PF->sizeFunction);
if (PF->options & NSPointerFunctionsZeroingWeakMemory)
WEAK_WRITE(dst, src);
if (memoryType(PF->options, NSPointerFunctionsWeakMemory))
ARC_WEAK_WRITE(dst, 0);
else if (memoryType(PF->options, NSPointerFunctionsZeroingWeakMemory))
WEAK_WRITE(dst, (void*)0);
else
*dst = src;
}