CPunch/Laika
1
0
Fork 0
mirror of https://github.com/CPunch/Laika.git synced 2024-11-24 05:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Refactored VLAs to support macrohard

Browse Source
This commit is contained in:
CPunch 2022-03-14 12:06:32 -05:00
parent 6a5afb18a0
commit cb9823d21c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/include/lmem.h
View File

@ -5,6 +5,16 @@
#define GROW_FACTOR 2 #define GROW_FACTOR 2
/* microsoft strikes again with their lack of support for VLAs */
#if _MSC_VER
#define VLA(type, var, sz) type var = laikaM_malloc(sizeof(type)*sz);
#define ENDVLA(var) laikaM_free(var);
#else
#define VLA(type, var, sz) type var[sz];
/* stubbed */
#define ENDVLA(var)
#endif
#define laikaM_malloc(sz) laikaM_realloc(NULL, sz) #define laikaM_malloc(sz) laikaM_realloc(NULL, sz)
#define laikaM_free(buf) laikaM_realloc(buf, 0) #define laikaM_free(buf) laikaM_realloc(buf, 0)

7
lib/src/lsocket.c
View File

@ -239,7 +239,7 @@ uint8_t laikaS_readByte(struct sLaika_socket *sock) {
void laikaS_readInt(struct sLaika_socket *sock, void *buf, size_t sz) { void laikaS_readInt(struct sLaika_socket *sock, void *buf, size_t sz) {
if (sock->flipEndian) { if (sock->flipEndian) {
uint8_t tmp[sz]; /* allocate tmp buffer to hold data while we switch endianness */ VLA(uint8_t, tmp, sz); /* allocate tmp buffer to hold data while we switch endianness */
int k; int k;
laikaS_read(sock, (void*)tmp, sz); laikaS_read(sock, (void*)tmp, sz);
@ -247,6 +247,8 @@ void laikaS_readInt(struct sLaika_socket *sock, void *buf, size_t sz) {
/* copy tmp buffer to user buffer, flipping endianness */ /* copy tmp buffer to user buffer, flipping endianness */
for (k = 0; k < sz; k++) for (k = 0; k < sz; k++)
*(uint8_t*)(buf + k) = tmp[sz - k - 1]; *(uint8_t*)(buf + k) = tmp[sz - k - 1];
ENDVLA(tmp);
} else { } else {
/* just a wrapper for laikaS_read */ /* just a wrapper for laikaS_read */
laikaS_read(sock, buf, sz); laikaS_read(sock, buf, sz);
@ -255,7 +257,7 @@ void laikaS_readInt(struct sLaika_socket *sock, void *buf, size_t sz) {
void laikaS_writeInt(struct sLaika_socket *sock, void *buf, size_t sz) { void laikaS_writeInt(struct sLaika_socket *sock, void *buf, size_t sz) {
if (sock->flipEndian) { if (sock->flipEndian) {
uint8_t tmp[sz]; /* allocate tmp buffer to hold data while we switch endianness */ VLA(uint8_t, tmp, sz); /* allocate tmp buffer to hold data while we switch endianness */
int k; int k;
/* copy user buffer to tmp buffer, flipping endianness */ /* copy user buffer to tmp buffer, flipping endianness */
@ -263,6 +265,7 @@ void laikaS_writeInt(struct sLaika_socket *sock, void *buf, size_t sz) {
tmp[k] = *(uint8_t*)(buf + (sz - k - 1)); tmp[k] = *(uint8_t*)(buf + (sz - k - 1));
laikaS_write(sock, (void*)tmp, sz); laikaS_write(sock, (void*)tmp, sz);
ENDVLA(tmp);
} else { } else {
/* just a wrapper for laikaS_write */ /* just a wrapper for laikaS_write */
laikaS_write(sock, buf, sz); laikaS_write(sock, buf, sz);