diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bytecode/bytecode.c | 9 | ||||
| -rw-r--r-- | src/program.c | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/bytecode/bytecode.c b/src/bytecode/bytecode.c index 0a2b157..3b6d980 100644 --- a/src/bytecode/bytecode.c +++ b/src/bytecode/bytecode.c @@ -48,15 +48,12 @@ CHECK_RESULT int buffer_append_header(Buffer *program_data) { */ BytecodeHeader header; - header.magic_number = AMAL_BYTECODE_MAGIC_NUMBER; + am_memcpy(header.magic_number, AMAL_BYTECODE_MAGIC_NUMBER, AMAL_BYTECODE_MAGIC_NUMBER_SIZE); header.major_version = AMAL_BYTECODE_MAJOR_VERSION; header.minor_version = AMAL_BYTECODE_MINOR_VERSION; header.patch_version = AMAL_BYTECODE_PATCH_VERSION; -#if defined(AMAL_LITTLE_ENDIAN) - header.endian = 0; -#elif defined(AMAL_BIG_ENDIAN) - header.magic_number = byteswap32(header.magic_number); - header.endian = 1; +#if defined(AMAL_BIG_ENDIAN) + #error TODO: convert bytecode to little endian #endif return_if_error(buffer_append(program_data, &header, sizeof(header))); diff --git a/src/program.c b/src/program.c index 1a53b53..63d2b6e 100644 --- a/src/program.c +++ b/src/program.c @@ -8,6 +8,7 @@ #include <stdio.h> #include <errno.h> #include <assert.h> +#include <string.h> /* One gigabyte */ #define PROGRAM_MAX_SIZE 1024*1024*1024 @@ -194,11 +195,10 @@ static CHECK_RESULT int amal_program_read_header(amal_program *self) { am_memcpy(&header, self->data.data + self->read_index, sizeof(header)); self->read_index += sizeof(header); #ifdef AMAL_BIG_ENDIAN - header.magic_number = byteswap32(header.magic_number); #error TODO: Support big endian for program decoding #endif - if(header.magic_number != AMAL_BYTECODE_MAGIC_NUMBER) + if(memcmp(header.magic_number, AMAL_BYTECODE_MAGIC_NUMBER, AMAL_BYTECODE_MAGIC_NUMBER_SIZE) != 0) return AMAL_PROGRAM_INVALID_MAGIC_NUMBER; /* |