From d01a3b46633102031bc8f65bf69af4b3b4d073f3 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Mon, 2 Jun 2025 11:31:19 +0100 Subject: [PATCH] mie: refactor ir api into a separate sub-directory --- mie/include/mie/{ => ir}/alloca.h | 4 ++-- mie/include/mie/{ => ir}/arg.h | 2 +- mie/include/mie/{ => ir}/block.h | 2 +- mie/include/mie/{ => ir}/branch.h | 4 ++-- mie/include/mie/{ => ir}/builder.h | 6 +++--- mie/include/mie/{ => ir}/const.h | 2 +- mie/include/mie/{ => ir}/convert.h | 0 mie/include/mie/{ => ir}/ctx.h | 2 +- mie/include/mie/{ => ir}/data.h | 2 +- mie/include/mie/{ => ir}/func.h | 2 +- mie/include/mie/{ => ir}/instr.h | 2 +- mie/include/mie/{ => ir}/module.h | 2 +- mie/include/mie/{ => ir}/msg.h | 4 ++-- mie/include/mie/{ => ir}/op.h | 2 +- mie/include/mie/{ => ir}/phi.h | 0 mie/include/mie/{ => ir}/ptr.h | 4 ++-- mie/include/mie/{ => ir}/record.h | 4 ++-- mie/include/mie/{ => ir}/switch.h | 4 ++-- mie/include/mie/{ => ir}/type.h | 2 +- mie/include/mie/{ => ir}/value.h | 0 mie/{ => ir}/arg.c | 2 +- mie/{ => ir}/block.c | 10 +++++----- mie/{ => ir}/builder.c | 26 ++++++++++++------------ mie/{ => ir}/const.c | 2 +- mie/{ => ir}/convert/bitcode-read.c | 0 mie/{ => ir}/convert/bitcode-write.c | 0 mie/{ => ir}/convert/convert.c | 4 ++-- mie/{ => ir}/convert/convert.h | 2 +- mie/{ => ir}/convert/lex.c | 0 mie/{ => ir}/convert/lex.h | 0 mie/{ => ir}/convert/parse.c | 0 mie/{ => ir}/convert/parse.h | 0 mie/{ => ir}/convert/text-read.c | 0 mie/{ => ir}/convert/text-write.c | 30 ++++++++++++++-------------- mie/{ => ir}/ctx.c | 4 ++-- mie/{ => ir}/data.c | 6 +++--- mie/{ => ir}/func.c | 6 +++--- mie/{ => ir}/instr.c | 10 +++++----- mie/{ => ir}/module.c | 10 +++++----- mie/{ => ir}/record.c | 2 +- mie/{ => ir}/type.c | 2 +- mie/{ => ir}/value.c | 4 ++-- 42 files changed, 85 insertions(+), 85 deletions(-) rename mie/include/mie/{ => ir}/alloca.h (71%) rename mie/include/mie/{ => ir}/arg.h (89%) rename mie/include/mie/{ => ir}/block.h (96%) rename mie/include/mie/{ => ir}/branch.h (84%) rename mie/include/mie/{ => ir}/builder.h (98%) rename mie/include/mie/{ => ir}/const.h (97%) rename mie/include/mie/{ => ir}/convert.h (100%) rename mie/include/mie/{ => ir}/ctx.h (97%) rename mie/include/mie/{ => ir}/data.h (95%) rename mie/include/mie/{ => ir}/func.h (97%) rename mie/include/mie/{ => ir}/instr.h (96%) rename mie/include/mie/{ => ir}/module.h (97%) rename mie/include/mie/{ => ir}/msg.h (85%) rename mie/include/mie/{ => ir}/op.h (87%) rename mie/include/mie/{ => ir}/phi.h (100%) rename mie/include/mie/{ => ir}/ptr.h (91%) rename mie/include/mie/{ => ir}/record.h (83%) rename mie/include/mie/{ => ir}/switch.h (85%) rename mie/include/mie/{ => ir}/type.h (95%) rename mie/include/mie/{ => ir}/value.h (100%) rename mie/{ => ir}/arg.c (95%) rename mie/{ => ir}/block.c (94%) rename mie/{ => ir}/builder.c (97%) rename mie/{ => ir}/const.c (94%) rename mie/{ => ir}/convert/bitcode-read.c (100%) rename mie/{ => ir}/convert/bitcode-write.c (100%) rename mie/{ => ir}/convert/convert.c (98%) rename mie/{ => ir}/convert/convert.h (95%) rename mie/{ => ir}/convert/lex.c (100%) rename mie/{ => ir}/convert/lex.h (100%) rename mie/{ => ir}/convert/parse.c (100%) rename mie/{ => ir}/convert/parse.h (100%) rename mie/{ => ir}/convert/text-read.c (100%) rename mie/{ => ir}/convert/text-write.c (98%) rename mie/{ => ir}/ctx.c (99%) rename mie/{ => ir}/data.c (93%) rename mie/{ => ir}/func.c (97%) rename mie/{ => ir}/instr.c (90%) rename mie/{ => ir}/module.c (96%) rename mie/{ => ir}/record.c (95%) rename mie/{ => ir}/type.c (89%) rename mie/{ => ir}/value.c (96%) diff --git a/mie/include/mie/alloca.h b/mie/include/mie/ir/alloca.h similarity index 71% rename from mie/include/mie/alloca.h rename to mie/include/mie/ir/alloca.h index 85f6102..f143487 100644 --- a/mie/include/mie/alloca.h +++ b/mie/include/mie/ir/alloca.h @@ -1,8 +1,8 @@ #ifndef MIE_ALLOCA_H_ #define MIE_ALLOCA_H_ -#include -#include +#include +#include struct mie_alloca { struct mie_instr a_base; diff --git a/mie/include/mie/arg.h b/mie/include/mie/ir/arg.h similarity index 89% rename from mie/include/mie/arg.h rename to mie/include/mie/ir/arg.h index 88a2d03..a8a7061 100644 --- a/mie/include/mie/arg.h +++ b/mie/include/mie/ir/arg.h @@ -1,7 +1,7 @@ #ifndef MIE_ARG_H_ #define MIE_ARG_H_ -#include +#include #define MIE_ARG(p) ((struct mie_arg *)(p)) diff --git a/mie/include/mie/block.h b/mie/include/mie/ir/block.h similarity index 96% rename from mie/include/mie/block.h rename to mie/include/mie/ir/block.h index 15afee7..8634363 100644 --- a/mie/include/mie/block.h +++ b/mie/include/mie/ir/block.h @@ -3,7 +3,7 @@ #define MIE_BLOCK(p) ((struct mie_block *)(p)) -#include +#include struct mie_block { struct mie_value b_base; diff --git a/mie/include/mie/branch.h b/mie/include/mie/ir/branch.h similarity index 84% rename from mie/include/mie/branch.h rename to mie/include/mie/ir/branch.h index 32927f3..77de3b1 100644 --- a/mie/include/mie/branch.h +++ b/mie/include/mie/ir/branch.h @@ -1,8 +1,8 @@ #ifndef MIE_BRANCH_H_ #define MIE_BRANCH_H_ -#include -#include +#include +#include struct mie_branch { struct mie_instr b_base; diff --git a/mie/include/mie/builder.h b/mie/include/mie/ir/builder.h similarity index 98% rename from mie/include/mie/builder.h rename to mie/include/mie/ir/builder.h index 46423f0..11bd267 100644 --- a/mie/include/mie/builder.h +++ b/mie/include/mie/ir/builder.h @@ -2,10 +2,10 @@ #define MIE_BUILDER_H_ #include +#include +#include +#include #include -#include -#include -#include struct b_hashmap; diff --git a/mie/include/mie/const.h b/mie/include/mie/ir/const.h similarity index 97% rename from mie/include/mie/const.h rename to mie/include/mie/ir/const.h index 48b138e..b949454 100644 --- a/mie/include/mie/const.h +++ b/mie/include/mie/ir/const.h @@ -1,7 +1,7 @@ #ifndef MIE_CONST_H_ #define MIE_CONST_H_ -#include +#include #define MIE_CONST(p) ((struct mie_const *)(p)) diff --git a/mie/include/mie/convert.h b/mie/include/mie/ir/convert.h similarity index 100% rename from mie/include/mie/convert.h rename to mie/include/mie/ir/convert.h diff --git a/mie/include/mie/ctx.h b/mie/include/mie/ir/ctx.h similarity index 97% rename from mie/include/mie/ctx.h rename to mie/include/mie/ir/ctx.h index 5732f17..005f457 100644 --- a/mie/include/mie/ctx.h +++ b/mie/include/mie/ir/ctx.h @@ -2,7 +2,7 @@ #define MIE_CTX_H_ #include -#include +#include struct mie_ctx { struct mie_const *ctx_true, *ctx_false; diff --git a/mie/include/mie/data.h b/mie/include/mie/ir/data.h similarity index 95% rename from mie/include/mie/data.h rename to mie/include/mie/ir/data.h index 7d9688b..cc14b11 100644 --- a/mie/include/mie/data.h +++ b/mie/include/mie/ir/data.h @@ -1,7 +1,7 @@ #ifndef MIE_DATA_H_ #define MIE_DATA_H_ -#include +#include #define MIE_DATA(p) ((struct mie_data *)(p)) diff --git a/mie/include/mie/func.h b/mie/include/mie/ir/func.h similarity index 97% rename from mie/include/mie/func.h rename to mie/include/mie/ir/func.h index 4935f03..412ea65 100644 --- a/mie/include/mie/func.h +++ b/mie/include/mie/ir/func.h @@ -3,7 +3,7 @@ #define MIE_FUNC(p) ((struct mie_func *)(p)) -#include +#include struct mie_name_map; struct mie_type; diff --git a/mie/include/mie/instr.h b/mie/include/mie/ir/instr.h similarity index 96% rename from mie/include/mie/instr.h rename to mie/include/mie/ir/instr.h index ce0b17d..f712560 100644 --- a/mie/include/mie/instr.h +++ b/mie/include/mie/ir/instr.h @@ -1,7 +1,7 @@ #ifndef MIE_INSTR_H_ #define MIE_INSTR_H_ -#include +#include #define MIE_INSTR(p) ((struct mie_instr *)(p)) diff --git a/mie/include/mie/module.h b/mie/include/mie/ir/module.h similarity index 97% rename from mie/include/mie/module.h rename to mie/include/mie/ir/module.h index 7e8c337..7e109d2 100644 --- a/mie/include/mie/module.h +++ b/mie/include/mie/ir/module.h @@ -4,8 +4,8 @@ #define MIE_MODULE(p) ((struct mie_module *)(p)) #include +#include #include -#include struct mie_func; struct b_hashmap; diff --git a/mie/include/mie/msg.h b/mie/include/mie/ir/msg.h similarity index 85% rename from mie/include/mie/msg.h rename to mie/include/mie/ir/msg.h index ef08194..e124798 100644 --- a/mie/include/mie/msg.h +++ b/mie/include/mie/ir/msg.h @@ -1,8 +1,8 @@ #ifndef MIE_MSG_H_ #define MIE_MSG_H_ -#include -#include +#include +#include #define MIE_MSG(p) ((struct mie_msg *)(p)) diff --git a/mie/include/mie/op.h b/mie/include/mie/ir/op.h similarity index 87% rename from mie/include/mie/op.h rename to mie/include/mie/ir/op.h index 46fede9..9b2ebcd 100644 --- a/mie/include/mie/op.h +++ b/mie/include/mie/ir/op.h @@ -1,7 +1,7 @@ #ifndef MIE_ARITH_H_ #define MIE_ARITH_H_ -#include +#include struct mie_binary_op { struct mie_instr op_base; diff --git a/mie/include/mie/phi.h b/mie/include/mie/ir/phi.h similarity index 100% rename from mie/include/mie/phi.h rename to mie/include/mie/ir/phi.h diff --git a/mie/include/mie/ptr.h b/mie/include/mie/ir/ptr.h similarity index 91% rename from mie/include/mie/ptr.h rename to mie/include/mie/ir/ptr.h index 3bc3467..6e54587 100644 --- a/mie/include/mie/ptr.h +++ b/mie/include/mie/ir/ptr.h @@ -1,8 +1,8 @@ #ifndef MIE_PTR_H_ #define MIE_PTR_H_ -#include -#include +#include +#include struct mie_getelementptr { struct mie_instr gep_base; diff --git a/mie/include/mie/record.h b/mie/include/mie/ir/record.h similarity index 83% rename from mie/include/mie/record.h rename to mie/include/mie/ir/record.h index 5dde197..c3e4ebb 100644 --- a/mie/include/mie/record.h +++ b/mie/include/mie/ir/record.h @@ -3,8 +3,8 @@ #define MIE_RECORD(p) ((struct mie_record *)(p)) -#include -#include +#include +#include struct mie_record { struct mie_value r_base; diff --git a/mie/include/mie/switch.h b/mie/include/mie/ir/switch.h similarity index 85% rename from mie/include/mie/switch.h rename to mie/include/mie/ir/switch.h index 54032cc..01e059f 100644 --- a/mie/include/mie/switch.h +++ b/mie/include/mie/ir/switch.h @@ -1,8 +1,8 @@ #ifndef MIE_SWITCH_H_ #define MIE_SWITCH_H_ -#include -#include +#include +#include struct mie_switch_branch { struct mie_value *b_value; diff --git a/mie/include/mie/type.h b/mie/include/mie/ir/type.h similarity index 95% rename from mie/include/mie/type.h rename to mie/include/mie/ir/type.h index 7f4b914..957979e 100644 --- a/mie/include/mie/type.h +++ b/mie/include/mie/ir/type.h @@ -3,7 +3,7 @@ #define MIE_TYPE(p) ((struct mie_type *)(p)) -#include +#include enum mie_type_id { MIE_TYPE_VOID = 0x00u, diff --git a/mie/include/mie/value.h b/mie/include/mie/ir/value.h similarity index 100% rename from mie/include/mie/value.h rename to mie/include/mie/ir/value.h diff --git a/mie/arg.c b/mie/ir/arg.c similarity index 95% rename from mie/arg.c rename to mie/ir/arg.c index 69c5b05..29068cd 100644 --- a/mie/arg.c +++ b/mie/ir/arg.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/mie/block.c b/mie/ir/block.c similarity index 94% rename from mie/block.c rename to mie/ir/block.c index 0bacb5b..a37b104 100644 --- a/mie/block.c +++ b/mie/ir/block.c @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include struct mie_block *mie_block_create(struct mie_func *parent, const char *name) diff --git a/mie/builder.c b/mie/ir/builder.c similarity index 97% rename from mie/builder.c rename to mie/ir/builder.c index 6fb237c..8ac3f5e 100644 --- a/mie/builder.c +++ b/mie/ir/builder.c @@ -1,17 +1,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/mie/const.c b/mie/ir/const.c similarity index 94% rename from mie/const.c rename to mie/ir/const.c index a90ef08..daa7f41 100644 --- a/mie/const.c +++ b/mie/ir/const.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/mie/convert/bitcode-read.c b/mie/ir/convert/bitcode-read.c similarity index 100% rename from mie/convert/bitcode-read.c rename to mie/ir/convert/bitcode-read.c diff --git a/mie/convert/bitcode-write.c b/mie/ir/convert/bitcode-write.c similarity index 100% rename from mie/convert/bitcode-write.c rename to mie/ir/convert/bitcode-write.c diff --git a/mie/convert/convert.c b/mie/ir/convert/convert.c similarity index 98% rename from mie/convert/convert.c rename to mie/ir/convert/convert.c index dea6e34..797030a 100644 --- a/mie/convert/convert.c +++ b/mie/ir/convert/convert.c @@ -1,7 +1,7 @@ #include "convert.h" -#include -#include +#include +#include #include #include diff --git a/mie/convert/convert.h b/mie/ir/convert/convert.h similarity index 95% rename from mie/convert/convert.h rename to mie/ir/convert/convert.h index 4b618a0..d47d635 100644 --- a/mie/convert/convert.h +++ b/mie/ir/convert/convert.h @@ -1,7 +1,7 @@ #ifndef _MIE_CONVERT_H_ #define _MIE_CONVERT_H_ -#include +#include extern b_status write_char(struct mie_ir_converter *converter, char c); extern b_status write_string(struct mie_ir_converter *converter, const char *s); diff --git a/mie/convert/lex.c b/mie/ir/convert/lex.c similarity index 100% rename from mie/convert/lex.c rename to mie/ir/convert/lex.c diff --git a/mie/convert/lex.h b/mie/ir/convert/lex.h similarity index 100% rename from mie/convert/lex.h rename to mie/ir/convert/lex.h diff --git a/mie/convert/parse.c b/mie/ir/convert/parse.c similarity index 100% rename from mie/convert/parse.c rename to mie/ir/convert/parse.c diff --git a/mie/convert/parse.h b/mie/ir/convert/parse.h similarity index 100% rename from mie/convert/parse.h rename to mie/ir/convert/parse.h diff --git a/mie/convert/text-read.c b/mie/ir/convert/text-read.c similarity index 100% rename from mie/convert/text-read.c rename to mie/ir/convert/text-read.c diff --git a/mie/convert/text-write.c b/mie/ir/convert/text-write.c similarity index 98% rename from mie/convert/text-write.c rename to mie/ir/convert/text-write.c index 5dea2d4..eeeadb6 100644 --- a/mie/convert/text-write.c +++ b/mie/ir/convert/text-write.c @@ -3,21 +3,21 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define F_INCLUDE_TYPE 0x01u diff --git a/mie/ctx.c b/mie/ir/ctx.c similarity index 99% rename from mie/ctx.c rename to mie/ir/ctx.c index e3dab8a..822df23 100644 --- a/mie/ctx.c +++ b/mie/ir/ctx.c @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/mie/data.c b/mie/ir/data.c similarity index 93% rename from mie/data.c rename to mie/ir/data.c index 4c1180b..20243a2 100644 --- a/mie/data.c +++ b/mie/ir/data.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/mie/func.c b/mie/ir/func.c similarity index 97% rename from mie/func.c rename to mie/ir/func.c index 559b6ee..155015a 100644 --- a/mie/func.c +++ b/mie/ir/func.c @@ -1,8 +1,8 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/mie/instr.c b/mie/ir/instr.c similarity index 90% rename from mie/instr.c rename to mie/ir/instr.c index 4d3a6e2..f4df4e1 100644 --- a/mie/instr.c +++ b/mie/ir/instr.c @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void mie_instr_init(struct mie_instr *instr, enum mie_instr_type type) { diff --git a/mie/module.c b/mie/ir/module.c similarity index 96% rename from mie/module.c rename to mie/ir/module.c index f51f11d..39068a7 100644 --- a/mie/module.c +++ b/mie/ir/module.c @@ -1,9 +1,9 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/mie/record.c b/mie/ir/record.c similarity index 95% rename from mie/record.c rename to mie/ir/record.c index c8a1a3b..2f62bb1 100644 --- a/mie/record.c +++ b/mie/ir/record.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/mie/type.c b/mie/ir/type.c similarity index 89% rename from mie/type.c rename to mie/ir/type.c index 487d385..3bd2592 100644 --- a/mie/type.c +++ b/mie/ir/type.c @@ -1,4 +1,4 @@ -#include +#include static struct mie_type *get_type(struct mie_value *v, struct mie_ctx *ctx) { diff --git a/mie/value.c b/mie/ir/value.c similarity index 96% rename from mie/value.c rename to mie/ir/value.c index 046ab5a..a34c457 100644 --- a/mie/value.c +++ b/mie/ir/value.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include extern const struct mie_value_type module_value_type;