Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/SnFile
2 changes: 1 addition & 1 deletion include/snuk/interpreter/interpreter.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ typedef struct SnukInterpreter {
SnukSignal signal;
void *mem;
SnukAllocator allocator;
snLinearAllocator la;
SnLinearAllocator la;
SnukError err;
SnukSrcLoc cur_loc;
char err_msg_buf[256];
Expand Down
4 changes: 2 additions & 2 deletions include/snuk/logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ SNUK_API void snuk_logger_init(void);
SNUK_API void snuk_logger_deinit(void);

SNUK_API void snuk_log_msg(
snLogLevel level, const char *file, const char *function, long line, const char *format_string, ...);
SNUK_API void snuk_set_log_level(snLogLevel level);
SnLogLevel level, const char *file, const char *function, long line, const char *format_string, ...);
SNUK_API void snuk_set_log_level(SnLogLevel level);

#define log_trace(msg, ...) \
snuk_log_msg(SN_LOG_LEVEL_TRACE, __FILE__, __func__, __LINE__, msg, ##__VA_ARGS__)
Expand Down
6 changes: 3 additions & 3 deletions repl/runtime.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@

typedef struct Runtime {
void *mem;
snLinearAllocator la;
SnLinearAllocator la;
SnukInterpreter interpreter;
SnukAllocator parser_allocator;
} Runtime;

SNUK_INLINE void *runtime_alloc_fn(void *data, uint64_t size, uint64_t align) {
snLinearAllocator *la = (snLinearAllocator *)data;
SnLinearAllocator *la = (SnLinearAllocator *)data;
return sn_linear_allocator_allocate(la, size, align);
}

SNUK_INLINE void *runtime_realloc_fn(void *data, void *ptr, uint64_t new_size, uint64_t align) {
snLinearAllocator *la = (snLinearAllocator *)data;
SnLinearAllocator *la = (SnLinearAllocator *)data;
void *new = sn_linear_allocator_allocate(la, new_size, align);
// No need to worry about how much to copy
// since it is inside the given memory itself
Expand Down
4 changes: 2 additions & 2 deletions src/interpreter/interpreter.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
#define PAGES 10

SNUK_INLINE void *alloc_fn(void *data, uint64_t size, uint64_t align) {
snLinearAllocator *la = (snLinearAllocator *)data;
SnLinearAllocator *la = (SnLinearAllocator *)data;
return sn_linear_allocator_allocate(la, size, align);
}

SNUK_INLINE void *realloc_fn(void *data, void *ptr, uint64_t new_size, uint64_t align) {
snLinearAllocator *la = (snLinearAllocator *)data;
SnLinearAllocator *la = (SnLinearAllocator *)data;
void *new = sn_linear_allocator_allocate(la, new_size, align);
memcpy(new, ptr, new_size);
return new;
Expand Down
2 changes: 1 addition & 1 deletion src/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ char *snuk_read_line(char *buffer, uint64_t size) {

// reads entire file, caller should free
char *snuk_read_file(const char *path) {
snFile file;
SnFile file;
if (!sn_file_open(path, SN_FILE_OPEN_FLAG_READ, &file)) return NULL;

uint64_t file_size = sn_file_size(&file);
Expand Down
12 changes: 6 additions & 6 deletions src/logger.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ typedef struct stdout_stderr_sink {
bool colored_enabled[2];
} stdout_stderr_sink;

static void stdout_stderr_sink_write(const char *msg, size_t len, snLogLevel level, void *data);
static void stdout_stderr_sink_write(const char *msg, size_t len, SnLogLevel level, void *data);
static void stdout_stderr_sink_open(void *data);
static void stdout_stderr_sink_flush(void *data);

static snStaticLogger sl;
static SnStaticLogger sl;
static char log_buffer[LOGGER_BUFFER_SIZE];
static stdout_stderr_sink sink_data;
static snSink sinks[] = {
static SnSink sinks[] = {
{.open = stdout_stderr_sink_open, .flush = stdout_stderr_sink_flush, .write = stdout_stderr_sink_write, .data = &sink_data}
};

void snuk_logger_init(void) {
sn_static_logger_init(&sl, log_buffer, LOGGER_BUFFER_SIZE, sinks, SNUK_ARRAY_LENGTH(sinks));
}

void snuk_set_log_level(snLogLevel level) {
void snuk_set_log_level(SnLogLevel level) {
sn_static_logger_set_level(&sl, level);
}

Expand All @@ -45,7 +45,7 @@ void snuk_logger_deinit(void) {
}

void snuk_log_msg(
snLogLevel level, const char *file, const char *function, long line, const char *format_string, ...) {
SnLogLevel level, const char *file, const char *function, long line, const char *format_string, ...) {
if (level < sl.level) return;

const char *level_string = NULL;
Expand Down Expand Up @@ -79,7 +79,7 @@ void snuk_log_msg(
va_end(args);
}

static void stdout_stderr_sink_write(const char *msg, size_t len, snLogLevel level, void *data) {
static void stdout_stderr_sink_write(const char *msg, size_t len, SnLogLevel level, void *data) {
stdout_stderr_sink *sink = (stdout_stderr_sink *)data;

bool error = level > SN_LOG_LEVEL_WARN;
Expand Down
2 changes: 1 addition & 1 deletion src/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static void reverse_decommit_pages(SnukPageAllocator *allocator, void *base, uin
static void try_increasing_allocator_size(void);

static SnukPageAllocator page_allocator;
static snFreeListAllocator galloc;
static SnFreeListAllocator galloc;

bool snuk_memory_init(uint64_t reserve_size) {
uint64_t page_size = sn_vm_get_page_size();
Expand Down
Loading