From 9af971c074deec08ddb846e49852bef2f64e45f6 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Fri, 13 Dec 2024 17:20:58 +0000 Subject: [PATCH] asm: fix all compiler warnings --- asm/assembler/assembler.c | 20 +++++----- asm/assembler/assembler.h | 11 +++--- asm/assembler/constpool.c | 70 +++++++++++++++++++++------------ asm/include/ivy/asm/assembler.h | 5 ++- asm/include/ivy/asm/bin.h | 2 - asm/parse/constpool.c | 43 ++++++++++++++++---- asm/parse/parse.c | 6 +-- 7 files changed, 102 insertions(+), 55 deletions(-) diff --git a/asm/assembler/assembler.c b/asm/assembler/assembler.c index 05c537c..cc80028 100644 --- a/asm/assembler/assembler.c +++ b/asm/assembler/assembler.c @@ -29,7 +29,7 @@ struct ivy_assembler { size_t as_data_offset; FILE *as_xdat; - extended_data_key as_next_xdata_key; + ivy_extended_data_key as_next_xdata_key; }; enum ivy_status ivy_assembler_create(FILE *fp, struct ivy_assembler **as) @@ -83,7 +83,7 @@ enum ivy_status ivy_assembler_finish(struct ivy_assembler *as) struct ivy_bin_table_entry xdat = {0}; xdat.e_offset = b_i64_htob(as->as_data_offset); - xdat.e_size = b_i32_htob(xdat_len); + xdat.e_size = b_i32_htob((uint32_t)xdat_len); xdat.e_type = b_i32_htob(IVY_TABLE_XDAT); while (1) { @@ -150,13 +150,13 @@ size_t assembler_write_data(struct ivy_assembler *as, const void *p, size_t len) return offset; } -extended_data_key assembler_write_extended_data(struct ivy_assembler *as, const void *p, size_t len) +ivy_extended_data_key assembler_write_extended_data(struct ivy_assembler *as, const void *p, size_t len) { - extended_data_key key = as->as_next_xdata_key; + ivy_extended_data_key key = as->as_next_xdata_key; fwrite(p, 1, len, as->as_xdat); - as->as_next_xdata_key += len; + as->as_next_xdata_key += (ivy_extended_data_key)len; return key; } @@ -167,7 +167,7 @@ struct assembler_scope *assembler_get_scope(struct ivy_assembler *as) enum ivy_status ivy_assembler_begin_scope( struct ivy_assembler *as, enum ivy_assembler_scope_type type, - ivy_assembler_attrib_table attrib) + const ivy_assembler_attrib_table attrib) { if (type < 0 || type >= nr_scope_types) { return IVY_ERR_NOT_SUPPORTED; @@ -228,8 +228,8 @@ enum ivy_status ivy_assembler_end_scope(struct ivy_assembler *as) memset(entry, 0x0, sizeof *entry); - entry->e_data.e_offset = b_i64_htob(as->as_scope->s_start_offset); - entry->e_data.e_size = b_i32_htob(as->as_data_offset - as->as_scope->s_start_offset); + entry->e_data.e_offset = b_i64_htob((uint64_t)as->as_scope->s_start_offset); + entry->e_data.e_size = b_i32_htob((uint32_t)(as->as_data_offset - as->as_scope->s_start_offset)); switch (as->as_scope->s_type) { case IVY_ASM_SCOPE_CLASS: @@ -261,7 +261,7 @@ enum ivy_status ivy_assembler_end_scope(struct ivy_assembler *as) enum ivy_status ivy_assembler_put_pval( struct ivy_assembler *as, enum ivy_assembler_pval_type type, - unsigned long index, const void *val) + const void *val, ivy_extended_data_key *key) { struct assembler_scope *scope = as->as_scope; @@ -274,7 +274,7 @@ enum ivy_status ivy_assembler_put_pval( return IVY_ERR_NOT_SUPPORTED; } - return type_info->s_put_pval(as, scope, type, index, val); + return type_info->s_put_pval(as, scope, type, val, key); } enum ivy_status ivy_assembler_put_xval( diff --git a/asm/assembler/assembler.h b/asm/assembler/assembler.h index 55f7ad4..5e82ad6 100644 --- a/asm/assembler/assembler.h +++ b/asm/assembler/assembler.h @@ -2,16 +2,15 @@ #define _ASSEMBLER_ASSEMBLER_H_ #include +#include #include struct assembler_scope_type; -typedef size_t extended_data_key; - struct assembler_scope { enum ivy_assembler_scope_type s_type; unsigned long s_attrib[__IVY_ASM_ATTRIB_COUNT]; - struct assembler_scope_type *s_ops; + const struct assembler_scope_type *s_ops; size_t s_start_offset; }; @@ -30,8 +29,8 @@ struct assembler_scope_type { enum ivy_status(*s_put_pval)(struct ivy_assembler *, struct assembler_scope *, enum ivy_assembler_pval_type, - unsigned long, - const void *); + const void *, + ivy_extended_data_key *key); enum ivy_status(*s_put_xval)( struct ivy_assembler *, @@ -46,7 +45,7 @@ struct assembler_scope_type { }; extern size_t assembler_write_data(struct ivy_assembler *as, const void *p, size_t len); -extern extended_data_key assembler_write_extended_data(struct ivy_assembler *as, const void *p, size_t len); +extern ivy_extended_data_key assembler_write_extended_data(struct ivy_assembler *as, const void *p, size_t len); extern struct assembler_scope *assembler_get_scope(struct ivy_assembler *as); diff --git a/asm/assembler/constpool.c b/asm/assembler/constpool.c index 86d84f9..7a834ee 100644 --- a/asm/assembler/constpool.c +++ b/asm/assembler/constpool.c @@ -29,35 +29,38 @@ static enum ivy_status init_scope( return IVY_OK; } -static ivy_bin_data_handle get_cached_string(struct constpool_assembler_scope *scope, const char *s) +static ivy_extended_data_key get_cached_string( + struct constpool_assembler_scope *scope, const char *s) { - b_number *key = b_dict_at(scope->s_strings, s); + b_number *key = B_NUMBER(b_dict_at(scope->s_strings, s)); if (!key) { - return IVY_BIN_NULL_HANDLE; + return IVY_EX_DATA_KEY_NULL; } - return (ivy_bin_data_handle)b_number_get_int32(key); + return (ivy_extended_data_key)b_number_get_int32(key); } -static void put_cached_string(struct constpool_assembler_scope *scope, const char *s, ivy_bin_data_handle key) +static void put_cached_string( + struct constpool_assembler_scope *scope, const char *s, + ivy_extended_data_key key) { b_dict_put(scope->s_strings, s, B_RV_INT32(key)); } -static ivy_bin_data_handle write_string(struct ivy_assembler *as, const char *s) +static ivy_extended_data_key write_string(struct ivy_assembler *as, const char *s) { struct constpool_assembler_scope *scope = (struct constpool_assembler_scope *)assembler_get_scope(as); - ivy_bin_data_handle key = get_cached_string(scope, s); - if (key != IVY_BIN_NULL_HANDLE) { + ivy_extended_data_key key = get_cached_string(scope, s); + if (key != IVY_EX_DATA_KEY_NULL) { return key; } size_t len = strlen(s); struct ivy_bin_string str = { 0 }; - str.s_hash = b_i32_htob(b_hash_string(s)); - str.s_len = b_i32_htob(len); + str.s_hash = b_i32_htob((uint32_t)b_hash_string(s)); + str.s_len = b_i32_htob((uint32_t)len); key = assembler_write_extended_data(as, &str, sizeof str); @@ -69,7 +72,8 @@ static ivy_bin_data_handle write_string(struct ivy_assembler *as, const char *s) return key; } -static ivy_bin_data_handle write_selector(struct ivy_assembler *as, const struct ivy_selector *sel) +static ivy_extended_data_key write_selector( + struct ivy_assembler *as, const struct ivy_selector *sel) { struct ivy_bin_selector dat = {0}; switch (sel->sel_recipient) { @@ -80,18 +84,19 @@ static ivy_bin_data_handle write_selector(struct ivy_assembler *as, const struct dat.sel_flags = IVY_BIN_SELECTOR_OBJECT; break; default: - return IVY_BIN_NULL_HANDLE; + return IVY_EX_DATA_KEY_NULL; } if (sel->sel_name) { dat.sel_name = b_i32_htob(write_string(as, sel->sel_name)); } - unsigned int i = 0; - unsigned int nr_args = b_queue_length(&sel->sel_args); + size_t i = 0; + size_t nr_args = b_queue_length(&sel->sel_args); /* TODO hash. */ - ivy_bin_data_handle *arg_handles = calloc(nr_args, sizeof(ivy_bin_data_handle)); + ivy_extended_data_key *arg_handles + = calloc(nr_args, sizeof(ivy_extended_data_key)); b_queue_iterator it = {0}; b_queue_foreach (&it, &sel->sel_args) { @@ -99,7 +104,8 @@ static ivy_bin_data_handle write_selector(struct ivy_assembler *as, const struct arg_handles[i++] = write_string(as, arg->arg_label); } - ivy_bin_data_handle selector_handle = assembler_write_extended_data(as, &dat, sizeof dat); + ivy_extended_data_key selector_handle + = assembler_write_extended_data(as, &dat, sizeof dat); for (i = 0; i < nr_args; i++) { b_i32 arg_handle = b_i32_htob(arg_handles[i]); assembler_write_extended_data(as, &arg_handle, sizeof arg_handle); @@ -109,15 +115,17 @@ static ivy_bin_data_handle write_selector(struct ivy_assembler *as, const struct return selector_handle; } -static ivy_bin_data_handle write_ident(struct ivy_assembler *as, const struct ivy_ident *id) +static ivy_extended_data_key write_ident( + struct ivy_assembler *as, const struct ivy_ident *id) { struct ivy_bin_ident dat = {0}; /* TODO hash. */ - unsigned int nr_parts = b_queue_length(&id->id_parts); - unsigned int i = 0; + size_t nr_parts = b_queue_length(&id->id_parts); + size_t i = 0; - ivy_bin_data_handle *part_handles = calloc(nr_parts, sizeof(ivy_bin_data_handle)); + ivy_extended_data_key *part_handles + = calloc(nr_parts, sizeof(ivy_extended_data_key)); b_queue_iterator it = {0}; b_queue_foreach (&it, &id->id_parts) { struct ivy_ident_part *arg = b_unbox(struct ivy_ident_part, it.entry, p_entry); @@ -126,7 +134,8 @@ static ivy_bin_data_handle write_ident(struct ivy_assembler *as, const struct iv dat.id_nr_parts = (uint8_t)nr_parts; - ivy_bin_data_handle ident_handle = assembler_write_extended_data(as, &dat, sizeof dat); + ivy_extended_data_key ident_handle + = assembler_write_extended_data(as, &dat, sizeof dat); for (i = 0; i < nr_parts; i++) { b_i32 part_handle = b_i32_htob(part_handles[i]); @@ -139,23 +148,27 @@ static ivy_bin_data_handle write_ident(struct ivy_assembler *as, const struct iv static enum ivy_status put_pval( struct ivy_assembler *as, struct assembler_scope *scope, - enum ivy_assembler_pval_type type, unsigned long index, const void *val) + enum ivy_assembler_pval_type type, const void *val, ivy_extended_data_key *key) { struct ivy_bin_constpool_table_entry entry = {0}; uintptr_t i = *(uintptr_t *)val; + ivy_extended_data_key k = IVY_EX_DATA_KEY_NULL; switch (type) { case IVY_ASM_PVAL_STRING: entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_STRING); - entry.e_ex_handle = b_i32_htob(write_string(as, val)); + k = write_string(as, val); + entry.e_ex_handle = b_i32_htob(k); break; case IVY_ASM_PVAL_IDENT: entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_IDENT); - entry.e_ex_handle = b_i32_htob(write_ident(as, val)); + k = write_ident(as, val); + entry.e_ex_handle = b_i32_htob(k); break; case IVY_ASM_PVAL_ATOM: entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_ATOM); - entry.e_ex_handle = b_i32_htob(write_string(as, val)); + k = write_string(as, val); + entry.e_ex_handle = b_i32_htob(k); break; case IVY_ASM_PVAL_SINT: entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_INT); @@ -167,12 +180,17 @@ static enum ivy_status put_pval( break; case IVY_ASM_PVAL_SELECTOR: entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_SELECTOR); - entry.e_ex_handle = b_i32_htob(write_selector(as, val)); + k = write_selector(as, val); + entry.e_ex_handle = b_i32_htob(k); break; default: return IVY_ERR_NOT_SUPPORTED; } + if (key) { + *key = k; + } + assembler_write_data(as, &entry, sizeof entry); return IVY_OK; } diff --git a/asm/include/ivy/asm/assembler.h b/asm/include/ivy/asm/assembler.h index 5a76a0f..6b606b9 100644 --- a/asm/include/ivy/asm/assembler.h +++ b/asm/include/ivy/asm/assembler.h @@ -7,6 +7,9 @@ #include #define IVY_ASM_INDEX_AUTO (-1) +#define IVY_EX_DATA_KEY_NULL ((ivy_extended_data_key)0) + +typedef uint32_t ivy_extended_data_key; struct ivy_selector; struct ivy_instr; @@ -63,7 +66,7 @@ IVY_API enum ivy_status ivy_assembler_end_scope(struct ivy_assembler *as); IVY_API enum ivy_status ivy_assembler_put_pval( struct ivy_assembler *as, enum ivy_assembler_pval_type type, - unsigned long index, const void *val); + const void *val, ivy_extended_data_key *key); IVY_API enum ivy_status ivy_assembler_put_xval( struct ivy_assembler *as, enum ivy_assembler_xval_type type, const ivy_assembler_attrib_table attrib); diff --git a/asm/include/ivy/asm/bin.h b/asm/include/ivy/asm/bin.h index 0daa644..50f126d 100644 --- a/asm/include/ivy/asm/bin.h +++ b/asm/include/ivy/asm/bin.h @@ -29,8 +29,6 @@ #define IVY_BIN_NULL_HANDLE ((ivy_bin_data_handle)0) -typedef uint32_t ivy_bin_data_handle; - struct ivy_bin_header { b_i32 h_magic; b_i16 h_table_len; diff --git a/asm/parse/constpool.c b/asm/parse/constpool.c index edcfcfa..d618388 100644 --- a/asm/parse/constpool.c +++ b/asm/parse/constpool.c @@ -17,7 +17,7 @@ struct constpool_parser_state { } s_current_pval_val; bool s_current_index_set; - unsigned int s_current_index; + size_t s_current_index; }; static enum ivy_status parse_linefeed(struct ivy_asm_parser *ctx, struct ivy_asm_token *tok) @@ -32,37 +32,66 @@ static enum ivy_status parse_linefeed(struct ivy_asm_parser *ctx, struct ivy_asm return IVY_OK; } + enum ivy_status status = IVY_OK; + ivy_extended_data_key key = IVY_EX_DATA_KEY_NULL; struct ivy_asm_token *tmp = NULL; switch (state->s_current_pval_type) { case IVY_ASM_PVAL_IDENT: + status = ivy_assembler_put_pval( + ctx->p_assembler, IVY_ASM_PVAL_IDENT, + state->s_base.s_previous_value, &key); + if (status != IVY_OK) { + return status; + } + entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_IDENT); - entry.e_ex_handle = b_i32_htob(ivy_assembler_put_pval(ctx->p_assembler, IVY_ASM_PVAL_IDENT, state->s_current_index, state->s_base.s_previous_value)); + entry.e_ex_handle = b_i32_htob(key); ivy_ident_destroy(state->s_base.s_previous_value); break; case IVY_ASM_PVAL_ATOM: tmp = state->s_base.s_previous_value; + status = ivy_assembler_put_pval( + ctx->p_assembler, IVY_ASM_PVAL_ATOM, tmp->t_str, &key); + if (status != IVY_OK) { + return status; + } + entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_ATOM); - entry.e_ex_handle = b_i32_htob(ivy_assembler_put_pval(ctx->p_assembler, IVY_ASM_PVAL_ATOM, state->s_current_index, tmp->t_str)); + entry.e_ex_handle = b_i32_htob(key); ivy_asm_token_destroy(tmp); break; case IVY_ASM_PVAL_SINT: entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_INT); - entry.e_int = b_i32_htob(state->s_current_pval_val.tok->t_int.v); + entry.e_int = b_i32_htob((uint32_t)state->s_current_pval_val.tok->t_int.v); break; case IVY_ASM_PVAL_UINT: entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_UINT); - entry.e_int = b_i32_htob(state->s_current_pval_val.tok->t_int.uv); + entry.e_int = b_i32_htob( + (uint32_t)state->s_current_pval_val.tok->t_int.uv); break; case IVY_ASM_PVAL_SELECTOR: + status = ivy_assembler_put_pval( + ctx->p_assembler, IVY_ASM_PVAL_SELECTOR, + state->s_base.s_previous_value, &key); + if (status != IVY_OK) { + return status; + } + entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_SELECTOR); - entry.e_ex_handle = b_i32_htob(ivy_assembler_put_pval(ctx->p_assembler, IVY_ASM_PVAL_SELECTOR, state->s_current_index, state->s_base.s_previous_value)); + entry.e_ex_handle = b_i32_htob(key); ivy_selector_destroy(state->s_base.s_previous_value); break; case IVY_ASM_PVAL_STRING: tmp = state->s_current_pval_val.tok; + status = ivy_assembler_put_pval( + ctx->p_assembler, IVY_ASM_PVAL_STRING, tmp->t_str, &key); + if (status != IVY_OK) { + return status; + } + entry.e_type = b_i32_htob(IVY_CONSTPOOL_TABLE_STRING); - entry.e_ex_handle = b_i32_htob(ivy_assembler_put_pval(ctx->p_assembler, IVY_ASM_PVAL_STRING, state->s_current_index, tmp->t_str)); + entry.e_ex_handle = b_i32_htob(key); ivy_asm_token_destroy(tmp); break; default: diff --git a/asm/parse/parse.c b/asm/parse/parse.c index 4ee7519..d425e73 100644 --- a/asm/parse/parse.c +++ b/asm/parse/parse.c @@ -48,7 +48,7 @@ void ivy_asm_parser_set_assembler( static token_parse_function get_token_parser(struct parser_state *state, struct ivy_asm_token *tok) { - struct parser_state_type *type = state->s_type; + const struct parser_state_type *type = state->s_type; if (!type) { return NULL; } @@ -103,7 +103,7 @@ enum ivy_status ivy_asm_parser_push_token( return f(p, tok); } -static struct parser_state_type *get_parser_state_type(enum parser_state_type_id type) +static const struct parser_state_type *get_parser_state_type(enum parser_state_type_id type) { if (type < 0 || type >= nr_parser_state_types) { return NULL; @@ -114,7 +114,7 @@ static struct parser_state_type *get_parser_state_type(enum parser_state_type_id struct parser_state *asm_parser_push_state(struct ivy_asm_parser *parser, enum parser_state_type_id type) { - struct parser_state_type *type_info = get_parser_state_type(type); + const struct parser_state_type *type_info = get_parser_state_type(type); if (!type_info) { return NULL;