fix: typedef insertion order, size and field offset calculations

Author: Dax89

src/db/db.c

@@ -133,6 +133,8 @@ void rd_i_db_load(RDContext* ctx) {
     // restore NORET status in KB
     RDTypeDef** it;
     vect_each(it, &ctx->typedefs) {
+        rd_i_typedef_measure(ctx, *it);
+
         if((*it)->kind == RD_TKIND_FUNC && (*it)->func_.is_noret)
             rd_i_kb_add_noret(ctx, (*it)->name);
     }

src/db/queries.c

@@ -756,18 +756,16 @@ void _rd_i_db_query_set_type_def(RDContext* ctx, const RDTypeDef* tdef) {
     if(tdef->kind == RD_TKIND_PRIM) return;
 
     sqlite3_stmt* stmt = _rd_db_prepare_query(ctx, RD_QUERY_SET_TYPE_DEF, "\
-        INSERT INTO TypeDefs \
-            VALUES (:name, :kind, :size, :is_noret, :enum_type) \
-        ON CONFLICT DO \
+        INSERT INTO TypeDefs (name, kind, is_noret, enum_type) \
+            VALUES (:name, :kind, :is_noret, :enum_type) \
+        ON CONFLICT(name) DO \
             UPDATE SET kind = EXCLUDED.kind, \
-                       size = EXCLUDED.size, \
                        is_noret = EXCLUDED.is_noret, \
                        enum_type = EXCLUDED.enum_type \
     ");
 
     _rd_db_bind_param_str(ctx, stmt, ":name", tdef->name);
     _rd_db_bind_param_int(ctx, stmt, ":kind", (sqlite3_int64)tdef->kind);
-    _rd_db_bind_param_int(ctx, stmt, ":size", (sqlite3_int64)tdef->size);
 
     if(tdef->kind == RD_TKIND_FUNC)
         _rd_db_bind_param_int(ctx, stmt, ":is_noret", tdef->func_.is_noret);
@@ -825,15 +823,15 @@ RDTypeDefVect* _rd_i_db_query_get_all_type_defs(RDContext* ctx,
                                                 RDTypeDefVect* v) {
     sqlite3_stmt* stmt =
         _rd_db_prepare_query(ctx, RD_QUERY_GET_ALL_TYPE_DEFS, "\
-        SELECT name, kind, size, is_noret, enum_type \
+        SELECT name, kind, is_noret, enum_type \
         FROM TypeDefs \
+        ORDER BY id \
     ");
 
     while(_rd_db_step(ctx, stmt) == SQLITE_ROW) {
         const char* name = (const char*)sqlite3_column_text(stmt, 0);
         RDTypeKind kind = (RDTypeKind)sqlite3_column_int(stmt, 1);
-        usize size = (usize)sqlite3_column_int64(stmt, 2);
-        bool is_noret = (bool)sqlite3_column_int(stmt, 3);
+        bool is_noret = (bool)sqlite3_column_int(stmt, 2);
         const char* enum_type = (const char*)sqlite3_column_text(stmt, 4);
 
         sqlite3_stmt* stmt_param = _rd_db_prepare_get_all_type_param(ctx, name);
@@ -853,7 +851,6 @@ RDTypeDefVect* _rd_i_db_query_get_all_type_defs(RDContext* ctx,
             unreachable();
 
         assert(tdef);
-        tdef->size = size;
 
         while(_rd_db_step(ctx, stmt_param) == SQLITE_ROW) {
             // clang-format off

src/db/schema.c

@@ -32,9 +32,9 @@ CREATE TABLE IF NOT EXISTS XRefs ( \
 ); \
 \
 CREATE TABLE IF NOT EXISTS TypeDefs( \
-    name      TEXT PRIMARY KEY, \
+    id        INTEGER PRIMARY KEY AUTOINCREMENT, \
+    name      TEXT UNIQUE NOT NULL, \
     kind      INTEGER NOT NULL, \
-    size      INTEGER NOT NULL, \
     is_noret  INTEGER NOT NULL, \
     enum_type TEXT \
 ); \

src/types/def.c

@@ -67,7 +67,7 @@ static RDTypeDef* _rd_typedef_create(const char* name, RDTypeKind kind,
     return self;
 }
 
-static void _rd_typedef_resolve_size(const RDContext* ctx, RDTypeDef* tdef) {
+void rd_i_typedef_measure(const RDContext* ctx, RDTypeDef* tdef) {
     if(tdef->size > 0) return;
 
     switch(tdef->kind) {
@@ -317,15 +317,15 @@ bool rd_typedef_register(RDTypeDef* self, RDContext* ctx) {
     if(self->kind == RD_TKIND_FUNC && self->func_.is_noret)
         rd_i_kb_add_noret(ctx, self->name);
 
+    rd_i_typedef_measure(ctx, self);
+
     if(self->kind != RD_TKIND_PRIM) {
         rd_i_db_set_type_def(ctx, self); // don't save primitives in DB
 
         RD_LOG_INFO("%s definition '%s' registered",
                     _rd_typedef_kind_str(self->kind), self->name);
     }
 
-    _rd_typedef_resolve_size(ctx, self);
-
     if(!self->size) {
         RD_LOG_FAIL("type '%s' has unresolved size", self->name);
         goto fail;

src/types/def.h

@@ -55,7 +55,7 @@ typedef struct RDTypeDefVect {
 } RDTypeDefVect;
 
 void rd_i_register_primitives(RDContext* ctx);
-
+void rd_i_typedef_measure(const RDContext* ctx, RDTypeDef* tdef);
 RDTypeDef* rd_i_typedef_find(const RDContext* ctx, const char* name);
 
 static inline bool rd_i_typedef_is_compound(const RDTypeDef* self) {