oreodave/avm
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bugs in base.c

Browse Source 
In particular, __LITTLE_ENDIAN__ was not a functioning macro.
Instead, I implemented a version by hand (copied from IBM) that
actually figures out if the machine is little endian or not.

Thank you unit testing!
This commit is contained in:
Aryadev Chavali
2024-04-28 17:37:18 +05:30
parent cf6aa96539
commit cce3259b56
2 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/base.c
View File

@@ -28,61 +28,61 @@ union word_pun
hword_t hword_htobc(hword_t w)
{
#if __LITTLE_ENDIAN__
return w;
#else
if (LITTLE_ENDIAN)
return w;
union hword_pun x = {w};
union hword_pun y = {0};
for (size_t i = 0, j = HWORD_SIZE; i < HWORD_SIZE; ++i, --j)
y.bytes[j - 1] = x.bytes[i];
return y.h;
#endif
}
hword_t hword_bctoh(hword_t w)
{
#if __LITTLE_ENDIAN__
return w;
#else
if (LITTLE_ENDIAN)
return w;
union hword_pun x = {w};
union hword_pun y = {0};
for (size_t i = 0, j = HWORD_SIZE; i < HWORD_SIZE; ++i, --j)
y.bytes[j - 1] = x.bytes[i];
return y.h;
#endif
}
word_t word_htobc(word_t w)
{
#if __LITTLE_ENDIAN__
return w;
#else
if (LITTLE_ENDIAN)
return w;
union word_pun x = {w};
union word_pun y = {0};
for (size_t i = 0, j = WORD_SIZE; i < WORD_SIZE; ++i, --j)
y.bytes[j - 1] = x.bytes[i];
return y.h;
#endif
}
word_t word_bctoh(word_t w)
{
#if __LITTLE_ENDIAN__
return w;
#else
if (LITTLE_ENDIAN)
return w;
union word_pun x = {w};
union word_pun y = {0};
for (size_t i = 0, j = WORD_SIZE; i < WORD_SIZE; ++i, --j)
y.bytes[j - 1] = x.bytes[i];
return y.h;
#endif
}
hword_t convert_bytes_to_hword(byte_t *bytes)
{
hword_t be_h = 0;
memcpy(&be_h, bytes, HWORD_SIZE);
hword_t h = hword_bctoh(be_h);
hword_t h = 0;
for (size_t i = 0; i < HWORD_SIZE; ++i)
h |= ((hword_t)(bytes[i]) << (8 * i));
return h;
}
word_t convert_bytes_to_word(byte_t *bytes)
{
word_t h = 0;
for (size_t i = 0; i < WORD_SIZE; ++i)
h |= ((word_t)(bytes[i]) << (8 * i));
return h;
}
@@ -97,11 +97,3 @@ void convert_word_to_bytes(word_t w, byte_t *bytes)
word_t be_w = word_htobc(w);
memcpy(bytes, &be_w, WORD_SIZE);
}
word_t convert_bytes_to_word(byte_t *bytes)
{
word_t be_w = 0;
memcpy(&be_w, bytes, WORD_SIZE);
word_t w = word_bctoh(be_w);
return w;
}