From b3ff589dbd97f6057a03bedc7df8ccca7bd3662f Mon Sep 17 00:00:00 2001 From: Kimplul Date: Fri, 26 Apr 2024 16:39:38 +0300 Subject: formatting --- src/ast.c | 2 ++ src/compile.c | 34 +++++++++++++++++----------------- src/core.c | 3 ++- src/debug.c | 5 +++-- src/execute.c | 2 +- src/lower.c | 3 +++ 6 files changed, 28 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/ast.c b/src/ast.c index 10f14d0..8da9677 100644 --- a/src/ast.c +++ b/src/ast.c @@ -66,6 +66,7 @@ struct ast *gen_ast(enum ast_kind kind, return n; } +#ifdef DEBUG static void dump(int depth, const char *fmt, ...) { va_list args; @@ -165,6 +166,7 @@ void ast_dump_list(int depth, struct ast *root) ast_dump(depth, n); } } +#endif /* DEBUG */ int ast_visit(ast_callback_t before, ast_callback_t after, struct ast *n, void *d) diff --git a/src/compile.c b/src/compile.c index a45a4a6..11b75a5 100644 --- a/src/compile.c +++ b/src/compile.c @@ -286,8 +286,8 @@ static void compile_date_add(jit_state_t *j, struct insn i) get(j, JIT_R0, i.i0); get(j, JIT_R1, i.i1); jit_calli_2(j, date_add, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -307,8 +307,8 @@ static void compile_date_sub(jit_state_t *j, struct insn i) get(j, JIT_R0, i.i0); get(j, JIT_R1, i.i1); jit_calli_2(j, date_sub, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -332,8 +332,8 @@ static void compile_date_diff(jit_state_t *j, struct insn i) get(j, JIT_R1, i.i1); jit_calli_2(j, date_diff, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -350,7 +350,7 @@ static void compile_load_year(jit_state_t *j, struct insn i) { get(j, JIT_R0, i.i0); jit_calli_1(j, load_year, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -367,7 +367,7 @@ static void compile_load_month(jit_state_t *j, struct insn i) { get(j, JIT_R0, i.i0); jit_calli_1(j, load_month, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -384,7 +384,7 @@ static void compile_load_day(jit_state_t *j, struct insn i) { get(j, JIT_R0, i.i0); jit_calli_1(j, load_day, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -412,7 +412,7 @@ static void compile_load_weekday(jit_state_t *j, struct insn i) { get(j, JIT_R0, i.i0); jit_calli_1(j, load_weekday, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -428,7 +428,7 @@ static void compile_load_weeknum(jit_state_t *j, struct insn i) { get(j, JIT_R0, i.i0); jit_calli_1(j, load_weeknum, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -447,8 +447,8 @@ static void compile_store_year(jit_state_t *j, struct insn i) get(j, JIT_R0, i.i0); get(j, JIT_R1, i.i1); jit_calli_2(j, store_year, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -467,8 +467,8 @@ static void compile_store_month(jit_state_t *j, struct insn i) get(j, JIT_R0, i.i0); get(j, JIT_R1, i.i1); jit_calli_2(j, store_month, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); @@ -487,8 +487,8 @@ static void compile_store_day(jit_state_t *j, struct insn i) get(j, JIT_R0, i.i0); get(j, JIT_R1, i.i1); jit_calli_2(j, store_day, - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), - jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R0), + jit_operand_gpr(JIT_OPERAND_ABI_INT64, JIT_R1)); jit_retval_l(j, JIT_R0); put(j, JIT_R0, i.o); diff --git a/src/core.c b/src/core.c index bd8c359..6d01068 100644 --- a/src/core.c +++ b/src/core.c @@ -44,7 +44,8 @@ int run(const char *fname) FILE *f = fopen(fname, "rb"); if (!f) { - fprintf(stderr, "failed opening %s: %s\n", fname, strerror(errno)); + fprintf(stderr, "failed opening %s: %s\n", fname, + strerror(errno)); return -1; } diff --git a/src/debug.c b/src/debug.c index 0f0e0fe..168259c 100644 --- a/src/debug.c +++ b/src/debug.c @@ -28,7 +28,8 @@ static void print_bar(int lineno_len) fprintf(stderr, "%*s", lineno_len + 4, "| "); } -static void vsrc_multi_line(struct src_issue issue, const char *line_start, int lineno_len) +static void vsrc_multi_line(struct src_issue issue, const char *line_start, + int lineno_len) { /* just dump lines as they are, adding bars to the left */ size_t line = issue.loc.first_line; @@ -59,7 +60,7 @@ void vsrc_issue(struct src_issue issue, const char *msg, va_list args) * monochrome */ fprintf(stderr, "%s:%i:%i: ", - issue.fname, + issue.fname, issue.loc.first_line, issue.loc.first_col); diff --git a/src/execute.c b/src/execute.c index d5e180e..ace4adc 100644 --- a/src/execute.c +++ b/src/execute.c @@ -8,7 +8,7 @@ #define UNUSED(x) (void)x -#define DEF(x) \ +#define DEF(x) \ static void exec_##x(struct insn i, size_t sp, struct vec *stack, \ struct vec *globals) diff --git a/src/lower.c b/src/lower.c index 4b57a90..02efb1b 100644 --- a/src/lower.c +++ b/src/lower.c @@ -738,6 +738,9 @@ int lower_ast(struct ast *tree) static void destroy_fn(struct fn *f) { vec_destroy(&f->insns); + + /* filled in by JIT, but struct fn is still under the jurisdiction of + * lower.c so free arena here */ if (f->arena) munmap(f->arena, f->size); } -- cgit v1.2.3