zzy/spl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stage0 重命名 stage1 ast重新整理

Browse Source
This commit is contained in:
zzy
2026-08-16 10:51:45 +08:00
parent 78d767bf21
commit d3c63dab5c
6 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stage0/spl_disasm.c
View File

@@ -54,7 +54,7 @@ int main(int argc, const char **argv) {
spl_vm_ins_t *ins = &vec_at(prog.insns, i); spl_vm_ins_t *ins = &vec_at(prog.insns, i);
printf("%4zd: %s", i, spl_vm_opcode_name((spl_vm_opcode_t)ins->opcode)); printf("%4zd: %s", i, spl_vm_opcode_name((spl_vm_opcode_t)ins->opcode));
if (ins->type != SPL_VOID) if (ins->type != SPL_VOID)
printf(" %s", spl_vm_type_kind_name((spl_type_t)ins->type)); printf(" %s", spl_vm_type_kind_name((spl_vm_kind_t)ins->type));
printf(" %zd", ins->imm); printf(" %zd", ins->imm);
/* annotate jumps / calls */ /* annotate jumps / calls */

4
stage0/spl_mcode.c
View File

@@ -427,7 +427,7 @@ const char *opcode_name[] = {
#undef X #undef X
}; };
const char *spl_vm_opcode_name(spl_vm_opcode_t opcode) { return opcode_name[opcode]; } const char *spl_vm_opcode_name(spl_vm_opcode_t opcode) { return opcode_name[opcode]; }
const char *spl_vm_type_kind_name(spl_type_t type) { const char *spl_vm_type_kind_name(spl_vm_kind_t type) {
switch (type) { switch (type) {
case SPL_VOID: case SPL_VOID:
return "void"; return "void";
@@ -467,7 +467,7 @@ const char *spl_vm_type_kind_name(spl_type_t type) {
void spl_vm_ins_dump(spl_vm_ins_t *ins, spl_vm_val_t addr) { void spl_vm_ins_dump(spl_vm_ins_t *ins, spl_vm_val_t addr) {
printf("%4zu: %s", addr, spl_vm_opcode_name((spl_vm_opcode_t)ins->opcode)); printf("%4zu: %s", addr, spl_vm_opcode_name((spl_vm_opcode_t)ins->opcode));
if (ins->type != SPL_VOID) if (ins->type != SPL_VOID)
printf(" %s", spl_vm_type_kind_name((spl_type_t)ins->type)); printf(" %s", spl_vm_type_kind_name((spl_vm_kind_t)ins->type));
printf(" %zd:%zx", ins->imm, ins->imm); printf(" %zd:%zx", ins->imm, ins->imm);
printf("\n"); printf("\n");
} }

4
stage0/spl_mcode.h
View File

@@ -29,7 +29,7 @@ typedef enum {
SPL_F64, SPL_F64,
SPL_PTR, SPL_PTR,
SPL_TYPE_COUNT, SPL_TYPE_COUNT,
} spl_type_t; } spl_vm_kind_t;
/* clang-format off */ /* clang-format off */
#define SPL_OPCODES(X) \ #define SPL_OPCODES(X) \
@@ -213,7 +213,7 @@ spl_vm_native_t *spl_prog_get_native(spl_prog_t *prog, const char *name);
/* Opcode name lookup for debugging/dumping */ /* Opcode name lookup for debugging/dumping */
const char *spl_vm_opcode_name(spl_vm_opcode_t opcode); const char *spl_vm_opcode_name(spl_vm_opcode_t opcode);
const char *spl_vm_type_kind_name(spl_type_t type); const char *spl_vm_type_kind_name(spl_vm_kind_t type);
void spl_vm_ins_dump(spl_vm_ins_t *ins, spl_vm_val_t addr); void spl_vm_ins_dump(spl_vm_ins_t *ins, spl_vm_val_t addr);

13
stage0/spl_vm.c
View File

@@ -28,8 +28,8 @@
* Type helpers * Type helpers
* ================================================================ */ * ================================================================ */
static int spl_is_float(spl_type_t t) { return t == SPL_F32 || t == SPL_F64; } static int spl_is_float(spl_vm_kind_t t) { return t == SPL_F32 || t == SPL_F64; }
static int spl_is_signed(spl_type_t t) { static int spl_is_signed(spl_vm_kind_t t) {
switch (t) { switch (t) {
case SPL_I8: case SPL_I8:
case SPL_I16: case SPL_I16:
@@ -41,7 +41,7 @@ static int spl_is_signed(spl_type_t t) {
return 0; return 0;
} }
} }
static int spl_type_size(spl_type_t t) { static int spl_type_size(spl_vm_kind_t t) {
switch (t) { switch (t) {
case SPL_VOID: case SPL_VOID:
return 0; return 0;
@@ -123,7 +123,7 @@ static int spl_type_size(spl_type_t t) {
do { \ do { \
spl_vm_val_t _b = POP(), _a = POP(); \ spl_vm_val_t _b = POP(), _a = POP(); \
spl_vm_val_t _r = 0; \ spl_vm_val_t _r = 0; \
if (spl_is_float((spl_type_t)ins->type)) { \ if (spl_is_float((spl_vm_kind_t)ins->type)) { \
double _da, _db, _dr; \ double _da, _db, _dr; \
if (ins->type == SPL_F32) { \ if (ins->type == SPL_F32) { \
float _fa, _fb; \ float _fa, _fb; \
@@ -185,7 +185,7 @@ static int spl_type_size(spl_type_t t) {
if (_b == 0) \ if (_b == 0) \
VM_ERROR("division by zero"); \ VM_ERROR("division by zero"); \
spl_vm_val_t _r = 0; \ spl_vm_val_t _r = 0; \
if (spl_is_float((spl_type_t)ins->type)) { \ if (spl_is_float((spl_vm_kind_t)ins->type)) { \
double _da, _db, _dr; \ double _da, _db, _dr; \
if (ins->type == SPL_F32) { \ if (ins->type == SPL_F32) { \
float _fa, _fb; \ float _fa, _fb; \
@@ -545,6 +545,7 @@ LONG WINAPI UnhandledExceptionFilterImpl(EXCEPTION_POINTERS *pExceptionInfo) {
* ================================================================ */ * ================================================================ */
void spl_vm_init_ex(spl_vm_t *vm, int stack_size, int call_depth) { void spl_vm_init_ex(spl_vm_t *vm, int stack_size, int call_depth) {
#ifdef _WIN32 #ifdef _WIN32
SetErrorMode(SEM_FAILCRITICALERRORS);
SetUnhandledExceptionFilter(UnhandledExceptionFilterImpl); SetUnhandledExceptionFilter(UnhandledExceptionFilterImpl);
SetConsoleOutputCP(CP_UTF8); SetConsoleOutputCP(CP_UTF8);
SetConsoleCP(CP_UTF8); SetConsoleCP(CP_UTF8);
@@ -843,7 +844,7 @@ int spl_vm_run_once(spl_vm_t *vm) {
case SPL_NEG: { case SPL_NEG: {
spl_vm_val_t _a = POP(); spl_vm_val_t _a = POP();
if (spl_is_float((spl_type_t)ins->type)) { if (spl_is_float((spl_vm_kind_t)ins->type)) {
double _d; double _d;
if (ins->type == SPL_F32) { if (ins->type == SPL_F32) {
float _f; float _f;

15
stage1/spl_ast.c
View File

@@ -1792,8 +1792,8 @@ void spl_ast_prase(spl_ast_t *ast) {
if (d) if (d)
vec_push(members, d); vec_push(members, d);
} }
spl_ast_node_ref_t root = new_node(&p, SPL_AST_CONTAINER_ITEM, begin); spl_ast_node_ref_t root = new_node(&p, SPL_AST_CONTAINER_MEMBERS, begin);
node_at(ast, root)->container_item.members = members; node_at(ast, root)->container_members = members;
ast->root = root; ast->root = root;
ast->parsed = p.failed ? -1 : 1; ast->parsed = p.failed ? -1 : 1;
} }
@@ -1809,6 +1809,12 @@ void spl_ast_drop(spl_ast_t *ast) {
ast->root = 0; ast->root = 0;
} }
spl_ast_node_t *spl_ast_node(spl_ast_t *ast, spl_ast_node_ref_t node) {
if (!ast || node == 0)
return NULL;
return &vec_at(ast->node_buckets, node);
}
void spl_ast_valid(spl_ast_t *ast) { void spl_ast_valid(spl_ast_t *ast) {
if (!ast) if (!ast)
return; return;
@@ -1851,9 +1857,8 @@ static void dump_node(spl_ast_t *ast, spl_ast_node_ref_t node_ref, dump_stack_t
UNREACHABLE(); UNREACHABLE();
break; break;
case SPL_AST_CONTAINER_ITEM: case SPL_AST_CONTAINER_MEMBERS:
dump_vec(ast, node->container_item.attr_list, stack); dump_vec(ast, node->container_members, stack);
dump_vec(ast, node->container_item.members, stack);
break; break;
case SPL_AST_FN_DECL: case SPL_AST_FN_DECL:

10
stage1/spl_ast.h
View File

@@ -9,7 +9,7 @@
/* clang-format off */ /* clang-format off */
#define SPL_AST_KIND_TABLE \ #define SPL_AST_KIND_TABLE \
X(SPL_AST_NONE, V0, none) \ X(SPL_AST_NONE, V0, none) \
X(SPL_AST_CONTAINER_ITEM, V0, container_item) \ X(SPL_AST_CONTAINER_MEMBERS, V0, container_members) \
X(SPL_AST_FN_DECL, V0, fn_decl) \ X(SPL_AST_FN_DECL, V0, fn_decl) \
X(SPL_AST_FN_DEFINE, V0, fn_define) \ X(SPL_AST_FN_DEFINE, V0, fn_define) \
X(SPL_AST_TYPE_DECL, V0, type_decl) \ X(SPL_AST_TYPE_DECL, V0, type_decl) \
@@ -97,6 +97,7 @@
X(SPL_AST_TYPE_SLICE, V0, type_slice) \ X(SPL_AST_TYPE_SLICE, V0, type_slice) \
X(SPL_AST_TYPE_STRUCT, V0, type_struct) \ X(SPL_AST_TYPE_STRUCT, V0, type_struct) \
X(SPL_AST_TYPE_UNION, V0, type_union) \ X(SPL_AST_TYPE_UNION, V0, type_union) \
X(SPL_AST_TYPE_SHAPE, V0, type_shape) \
X(SPL_AST_TYPE_ENUM, V0, type_enum) \ X(SPL_AST_TYPE_ENUM, V0, type_enum) \
X(SPL_AST_TYPE_VOID, V0, type_void) \ X(SPL_AST_TYPE_VOID, V0, type_void) \
X(SPL_AST_TYPE_BOOL, V0, type_bool) \ X(SPL_AST_TYPE_BOOL, V0, type_bool) \
@@ -140,10 +141,7 @@ struct spl_ast_node {
usize resolved_def_id; usize resolved_def_id;
union { union {
struct { spl_ast_node_ref_vec_t container_members; /* container_decl */
spl_ast_node_ref_vec_t attr_list; /* attr_item */
spl_ast_node_ref_vec_t members; /* container_decl 列表 */
} container_item;
struct { struct {
const char *ident; const char *ident;
@@ -314,6 +312,8 @@ typedef struct {
void spl_ast_init(spl_ast_t *ast, const spl_tok_vec_t *tok_vec /*move*/); void spl_ast_init(spl_ast_t *ast, const spl_tok_vec_t *tok_vec /*move*/);
void spl_ast_drop(spl_ast_t *ast); void spl_ast_drop(spl_ast_t *ast);
spl_ast_node_t* spl_ast_node(spl_ast_t *ast, spl_ast_node_ref_t node);
void spl_ast_prase(spl_ast_t *ast); void spl_ast_prase(spl_ast_t *ast);
void spl_ast_valid(spl_ast_t *ast); void spl_ast_valid(spl_ast_t *ast);
void spl_ast_dump(spl_ast_t *ast, spl_ast_node_ref_t node); void spl_ast_dump(spl_ast_t *ast, spl_ast_node_ref_t node);