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

attempt to fix archiving endianness issue

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39604 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2016-03-25 08:37:36 +00:00
parent eea571011b
commit 96f9e36653
2 changed files with 66 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2016-03-25 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSNumber.m: Attempt to fix endianness archiving issue.
2016-03-23 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPropertyList.m: Remove unused function. Change binary

69
Source/NSNumber.m
View file

@ -1024,14 +1024,40 @@ if (aValue >= -1 && aValue <= 12)\
- (void) encodeWithCoder: (NSCoder *) coder
{
const char *type = [self objCType];
char buffer[16] __attribute__ ((aligned (16)));
unsigned char charbuf;
unsigned short shortbuf;
unsigned int intbuf;
unsigned long longbuf;
unsigned long long llongbuf;
float floatbuf;
double doublebuf;
void *buffer;
[coder encodeValueOfObjCType: @encode (char) at: type];
/* The most we currently store in an NSNumber is 8 bytes (double or long
* long), but we may add support for vectors or long doubles in future, so
* make this 16 bytes now so stuff doesn't break in fun and exciting ways
* later.
*/
switch (type[0])
{
case 'c':
case 'C':
buffer = &charbuf; break;
case 's':
case 'S':
buffer = &shortbuf; break;
case 'i':
case 'I':
buffer = &intbuf; break;
case 'l':
case 'L':
buffer = &longbuf; break;
case 'q':
case 'Q':
buffer = &llongbuf; break;
case 'f':
buffer = &floatbuf; break;
case 'd':
buffer = &doublebuf; break;
}
[self getValue: buffer];
[coder encodeValueOfObjCType: type at: buffer];
}
@ -1045,9 +1071,38 @@ if (aValue >= -1 && aValue <= 12)\
- (id) initWithCoder: (NSCoder *) coder
{
char type[2] = { 0 };
char buffer[16] __attribute__ ((aligned (16)));
unsigned char charbuf;
unsigned short shortbuf;
unsigned int intbuf;
unsigned long longbuf;
unsigned long long llongbuf;
float floatbuf;
double doublebuf;
void *buffer;
[coder decodeValueOfObjCType: @encode (char) at: type];
switch (type[0])
{
case 'c':
case 'C':
buffer = &charbuf; break;
case 's':
case 'S':
buffer = &shortbuf; break;
case 'i':
case 'I':
buffer = &intbuf; break;
case 'l':
case 'L':
buffer = &longbuf; break;
case 'q':
case 'Q':
buffer = &llongbuf; break;
case 'f':
buffer = &floatbuf; break;
case 'd':
buffer = &doublebuf; break;
}
[coder decodeValueOfObjCType: type at: buffer];
return [self initWithBytes: buffer objCType: type];
}