gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #314 from gnustep/pointerfunctions

Browse source 
Try to address issue of treating pointer function values as bitfield
This commit is contained in:
Fred Kiefer 2023-08-23 17:56:44 +02:00 committed by GitHub
commit 7fe39a23e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/NSConcreteHashTable.m
View file

@ -77,7 +77,7 @@ typedef GSIMapNode_t *GSIMapNode;
#define GSI_MAP_TABLE_S instanceSize
#define IS_WEAK(M) \
M->cb.pf.options & (NSPointerFunctionsZeroingWeakMemory | NSPointerFunctionsWeakMemory)
memoryType(M->cb.pf.options, NSPointerFunctionsZeroingWeakMemory) || memoryType(M->cb.pf.options, NSPointerFunctionsWeakMemory)
#define GSI_MAP_HASH(M, X)\
(M->legacy ? M->cb.old.hash(M, X.ptr) \
: pointerFunctionsHash(&M->cb.pf, X.ptr))

7
Source/NSConcretePointerFunctions.h
View file

@ -78,7 +78,12 @@ typedef struct
inline static BOOL memoryType(int options, int flag)
{
return (options & 0xff) == flag;
return ((options & 0xff) == flag) ? YES : NO;
}
inline static BOOL personalityType(int options, int flag)
{
return ((options & 0xff00) == flag) ? YES : NO;
}
/* Declare the concrete pointer functions class as a wrapper around

42
Source/NSConcretePointerFunctions.m
View file

@ -191,19 +191,19 @@ relinquishRetainedMemory(const void *item,
* should be used to relinquish contents of a container with these
* options.
*/
if (options & NSPointerFunctionsZeroingWeakMemory)
if (memoryType(options, NSPointerFunctionsZeroingWeakMemory))
{
_x.relinquishFunction = 0;
}
else if (options & NSPointerFunctionsOpaqueMemory)
else if (memoryType(options, NSPointerFunctionsOpaqueMemory))
{
_x.relinquishFunction = 0;
}
else if (options & NSPointerFunctionsMallocMemory)
else if (memoryType(options, NSPointerFunctionsMallocMemory))
{
_x.relinquishFunction = relinquishMallocMemory;
}
else if (options & NSPointerFunctionsMachVirtualMemory)
else if (memoryType(options, NSPointerFunctionsMachVirtualMemory))
{
_x.relinquishFunction = relinquishMallocMemory;
}
@ -214,16 +214,16 @@ relinquishRetainedMemory(const void *item,
/* Now we look at the personality options to determine other functions.
*/
if (options & NSPointerFunctionsOpaquePersonality)
if (personalityType(options, NSPointerFunctionsOpaquePersonality))
{
_x.acquireFunction = acquireExistingMemory;
_x.descriptionFunction = describePointer;
_x.hashFunction = hashShifted;
_x.isEqualFunction = equalDirect;
}
else if (options & NSPointerFunctionsObjectPointerPersonality)
else if (personalityType(options, NSPointerFunctionsObjectPointerPersonality))
{
if (options & NSPointerFunctionsZeroingWeakMemory)
if (memoryType(options, NSPointerFunctionsZeroingWeakMemory))
{
_x.acquireFunction = acquireExistingMemory;
}
@ -235,21 +235,21 @@ relinquishRetainedMemory(const void *item,
_x.hashFunction = hashShifted;
_x.isEqualFunction = equalDirect;
}
else if (options & NSPointerFunctionsCStringPersonality)
else if (personalityType(options, NSPointerFunctionsCStringPersonality))
{
_x.acquireFunction = acquireMallocMemory;
_x.descriptionFunction = describeString;
_x.hashFunction = hashString;
_x.isEqualFunction = equalString;
}
else if (options & NSPointerFunctionsStructPersonality)
else if (personalityType(options, NSPointerFunctionsStructPersonality))
{
_x.acquireFunction = acquireMallocMemory;
_x.descriptionFunction = describePointer;
_x.hashFunction = hashMemory;
_x.isEqualFunction = equalMemory;
}
else if (options & NSPointerFunctionsIntegerPersonality)
else if (personalityType(options, NSPointerFunctionsIntegerPersonality))
{
_x.acquireFunction = acquireExistingMemory;
_x.descriptionFunction = describeInteger;
@ -258,7 +258,7 @@ relinquishRetainedMemory(const void *item,
}
else /* objects */
{
if (options & NSPointerFunctionsZeroingWeakMemory)
if (memoryType(options, NSPointerFunctionsZeroingWeakMemory))
{
_x.acquireFunction = acquireExistingMemory;
}
@ -344,16 +344,18 @@ relinquishRetainedMemory(const void *item,
~(NSPointerFunctionsZeroingWeakMemory
|NSPointerFunctionsOpaqueMemory
|NSPointerFunctionsMallocMemory
|NSPointerFunctionsMachVirtualMemory);
|NSPointerFunctionsMachVirtualMemory
|NSPointerFunctionsWeakMemory);
}
- (void) setUsesWeakReadAndWriteBarriers: (BOOL)flag
{
_x.options |= NSPointerFunctionsZeroingWeakMemory;
_x.options &=
~(NSPointerFunctionsOpaqueMemory
|NSPointerFunctionsMallocMemory
|NSPointerFunctionsMachVirtualMemory);
|NSPointerFunctionsMachVirtualMemory
|NSPointerFunctionsWeakMemory);
_x.options |= NSPointerFunctionsZeroingWeakMemory;
}
- (NSUInteger (*)(const void *item)) sizeFunction
@ -363,20 +365,12 @@ relinquishRetainedMemory(const void *item,
- (BOOL) usesStrongWriteBarrier
{
if ((_x.options &
(NSPointerFunctionsZeroingWeakMemory
|NSPointerFunctionsOpaqueMemory
|NSPointerFunctionsMallocMemory
|NSPointerFunctionsMachVirtualMemory)) == NSPointerFunctionsStrongMemory)
return YES;
return NO;
return memoryType(_x.options, NSPointerFunctionsStrongMemory);
}
- (BOOL) usesWeakReadAndWriteBarriers
{
if (_x.options & NSPointerFunctionsZeroingWeakMemory)
return YES;
return NO;
return memoryType(_x.options, NSPointerFunctionsZeroingWeakMemory);
}
@end

4
Source/NSPointerArray.m
View file

@ -534,7 +534,7 @@ static Class concreteClass = Nil;
new_gf = new_cap / 2;
if (_contents == 0)
{
if (_pf.options & NSPointerFunctionsZeroingWeakMemory)
if (memoryType(_pf.options, NSPointerFunctionsZeroingWeakMemory))
{
ptr = (void**)NSAllocateCollectable(size, 0);
}
@ -545,7 +545,7 @@ static Class concreteClass = Nil;
}
else
{
if (_pf.options & NSPointerFunctionsZeroingWeakMemory)
if (memoryType(_pf.options, NSPointerFunctionsZeroingWeakMemory))
{
ptr = (void**)NSReallocateCollectable(
_contents, size, 0);