qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resurect the debugging messages in rua_obj.c

Browse source 
Yet another debug flag: SYS_RUA_OBJ
This commit is contained in:
Bill Currie 2011-01-10 09:21:42 +09:00
parent aac8185e4e
commit cb0bc7229a
3 changed files with 98 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/QF/sys.h
View file

@ -77,13 +77,15 @@ double Sys_DoubleTime (void);
void Sys_TimeOfDay(date_t *date); void Sys_TimeOfDay(date_t *date);
void Sys_MaskPrintf (int mask, const char *fmt, ...) __attribute__((format(printf,2,3))); void Sys_MaskPrintf (int mask, const char *fmt, ...) __attribute__((format(printf,2,3)));
#define SYS_DEV (1|0) #define SYS_DEV (1|0)
#define SYS_WARN (1|2) // bit 0 so developer 1 will pick it up #define SYS_WARN (1|2) // bit 0 so developer 1 will pick it up
#define SYS_VID (1|4) #define SYS_VID (1|4)
#define SYS_FS_NF (1|8) #define SYS_FS_NF (1|8)
#define SYS_FS_F (1|16) #define SYS_FS_F (1|16)
#define SYS_FS (1|32) #define SYS_FS (1|32)
#define SYS_NET (1|64) #define SYS_NET (1|64)
#define SYS_RUA_OBJ (1|128)
#define SYS_RUA_MSG (1|256)
int Sys_CheckInput (int idle, int net_socket); int Sys_CheckInput (int idle, int net_socket);
const char *Sys_ConsoleInput (void); const char *Sys_ConsoleInput (void);

99
libs/ruamoko/rua_obj.c
View file

@ -376,7 +376,7 @@ finish_class (progs_t *pr, pr_class_t *class, pointer_t object_ptr)
ml = &G_STRUCT (pr, pr_method_list_t, *ml).method_next; ml = &G_STRUCT (pr, pr_method_list_t, *ml).method_next;
*ml = class->methods; *ml = class->methods;
} }
Sys_MaskPrintf (SYS_DEV, " %d %d %d\n", meta->class_pointer, Sys_MaskPrintf (SYS_RUA_OBJ, " %x %x %x\n", meta->class_pointer,
meta->super_class, class->super_class); meta->super_class, class->super_class);
} }
@ -412,6 +412,7 @@ sel_register_typed_name (progs_t *pr, const char *name, const char *types,
int is_new = 0; int is_new = 0;
obj_list *l; obj_list *l;
Sys_MaskPrintf (SYS_RUA_OBJ, " Registering SEL %s %s\n", name, types);
index = (intptr_t) Hash_Find (pr->selector_hash, name); index = (intptr_t) Hash_Find (pr->selector_hash, name);
if (index) { if (index) {
for (l = pr->selector_sels[index]; l; l = l->next) { for (l = pr->selector_sels[index]; l; l = l->next) {
@ -420,14 +421,14 @@ sel_register_typed_name (progs_t *pr, const char *name, const char *types,
if (!s->sel_types && !types) { if (!s->sel_types && !types) {
if (sel) { if (sel) {
sel->sel_id = index; sel->sel_id = index;
return sel; goto done;
} }
return s; return s;
} }
} else if (strcmp (PR_GetString (pr, s->sel_types), types) == 0) { } else if (strcmp (PR_GetString (pr, s->sel_types), types) == 0) {
if (sel) { if (sel) {
sel->sel_id = index; sel->sel_id = index;
return sel; goto done;
} }
return s; return s;
} }
@ -449,14 +450,16 @@ sel_register_typed_name (progs_t *pr, const char *name, const char *types,
if (is_new) if (is_new)
Hash_Add (pr->selector_hash, (void *) index); Hash_Add (pr->selector_hash, (void *) index);
done:
Sys_MaskPrintf (SYS_RUA_OBJ, " %d @ %x\n",
sel->sel_id, PR_SetPointer (pr, sel));
return sel; return sel;
} }
static pr_sel_t * static pr_sel_t *
sel_register_name (progs_t *pr, const char *name) sel_register_name (progs_t *pr, const char *name)
{ {
return sel_register_typed_name (pr, name, 0, 0); return sel_register_typed_name (pr, name, "", 0);
} }
static void static void
@ -653,13 +656,33 @@ obj_find_message (progs_t *pr, pr_class_t *class, pr_sel_t *selector)
pr_method_t *method; pr_method_t *method;
pr_sel_t *sel; pr_sel_t *sel;
int i; int i;
int dev = developer->int_val;
string_t *names;
if (dev & SYS_RUA_MSG) {
names = pr->selector_names;
Sys_Printf ("Searching for %s\n",
PR_GetString (pr, names[selector->sel_id]));
}
while (c) { while (c) {
if (dev & SYS_RUA_MSG)
Sys_Printf ("Checking class %s @ %x\n",
PR_GetString (pr, c->name),
PR_SetPointer (pr, c));
method_list = &G_STRUCT (pr, pr_method_list_t, c->methods); method_list = &G_STRUCT (pr, pr_method_list_t, c->methods);
while (method_list) { while (method_list) {
if (dev & SYS_RUA_MSG) {
Sys_Printf ("method list %x\n",
PR_SetPointer (pr, method_list));
}
for (i = 0, method = method_list->method_list; for (i = 0, method = method_list->method_list;
i < method_list->method_count; i++, method++) { i < method_list->method_count; i++, method++) {
sel = &G_STRUCT (pr, pr_sel_t, method->method_name); sel = &G_STRUCT (pr, pr_sel_t, method->method_name);
if (developer->int_val & SYS_RUA_MSG) {
names = pr->selector_names;
Sys_Printf (" %s\n",
PR_GetString (pr, names[sel->sel_id]));
}
if (sel->sel_id == selector->sel_id) if (sel->sel_id == selector->sel_id)
return method; return method;
} }
@ -764,6 +787,23 @@ obj_verror (progs_t *pr, pr_id_t *object, int code, const char *fmt, int count,
PR_RunError (pr, "%s", dstr->str); PR_RunError (pr, "%s", dstr->str);
} }
static void
dump_ivars (progs_t *pr, pointer_t _ivars)
{
pr_ivar_list_t *ivars;
int i;
if (!_ivars)
return;
ivars = &G_STRUCT (pr, pr_ivar_list_t, _ivars);
for (i = 0; i < ivars->ivar_count; i++) {
Sys_Printf (" %s %s %d\n",
PR_GetString (pr, ivars->ivar_list[i].ivar_name),
PR_GetString (pr, ivars->ivar_list[i].ivar_type),
ivars->ivar_list[i].ivar_offset);
}
}
static void static void
rua___obj_exec_class (progs_t *pr) rua___obj_exec_class (progs_t *pr)
{ {
@ -779,6 +819,15 @@ rua___obj_exec_class (progs_t *pr)
symtab = &G_STRUCT (pr, pr_symtab_t, module->symtab); symtab = &G_STRUCT (pr, pr_symtab_t, module->symtab);
if (!symtab) if (!symtab)
return; return;
Sys_MaskPrintf (SYS_RUA_OBJ, "Initializing %s module\n"
"symtab @ %x : %d selector%s @ %x, "
"%d class%s and %d categor%s\n",
PR_GetString (pr, module->name), module->symtab,
symtab->sel_ref_cnt, symtab->sel_ref_cnt == 1 ? "" : "s",
symtab->refs,
symtab->cls_def_cnt, symtab->cls_def_cnt == 1 ? "" : "es",
symtab->cat_def_cnt,
symtab->cat_def_cnt == 1 ? "y" : "ies");
pr->module_list = list_cons (module, pr->module_list); pr->module_list = list_cons (module, pr->module_list);
@ -797,6 +846,28 @@ rua___obj_exec_class (progs_t *pr)
pr_class_t *meta = &G_STRUCT (pr, pr_class_t, class->class_pointer); pr_class_t *meta = &G_STRUCT (pr, pr_class_t, class->class_pointer);
const char *super_class = PR_GetString (pr, class->super_class); const char *super_class = PR_GetString (pr, class->super_class);
Sys_MaskPrintf (SYS_RUA_OBJ, "Class %s @ %x\n",
PR_GetString (pr, class->name), *ptr);
Sys_MaskPrintf (SYS_RUA_OBJ, " class pointer: %x\n",
class->class_pointer);
Sys_MaskPrintf (SYS_RUA_OBJ, " super class: %s\n",
PR_GetString (pr, class->super_class));
Sys_MaskPrintf (SYS_RUA_OBJ, " instance variables: %d @ %x\n",
class->instance_size,
class->ivars);
if (developer->int_val & SYS_RUA_OBJ)
dump_ivars (pr, class->ivars);
Sys_MaskPrintf (SYS_RUA_OBJ, " instance methods: %x\n",
class->methods);
Sys_MaskPrintf (SYS_RUA_OBJ, " protocols: %x\n", class->protocols);
Sys_MaskPrintf (SYS_RUA_OBJ, " class methods: %x\n", meta->methods);
Sys_MaskPrintf (SYS_RUA_OBJ, " instance variables: %d @ %x\n",
meta->instance_size,
meta->ivars);
if (developer->int_val & SYS_RUA_OBJ)
dump_ivars (pr, meta->ivars);
class->subclass_list = 0; class->subclass_list = 0;
Hash_Add (pr->classes, class); Hash_Add (pr->classes, class);
@ -820,6 +891,16 @@ rua___obj_exec_class (progs_t *pr)
const char *class_name = PR_GetString (pr, category->class_name); const char *class_name = PR_GetString (pr, category->class_name);
pr_class_t *class = Hash_Find (pr->classes, class_name); pr_class_t *class = Hash_Find (pr->classes, class_name);
Sys_MaskPrintf (SYS_RUA_OBJ, "Category %s (%s) @ %x\n",
PR_GetString (pr, category->class_name),
PR_GetString (pr, category->category_name), *ptr);
Sys_MaskPrintf (SYS_RUA_OBJ, " instance methods: %x\n",
category->instance_methods);
Sys_MaskPrintf (SYS_RUA_OBJ, " class methods: %x\n",
category->class_methods);
Sys_MaskPrintf (SYS_RUA_OBJ, " protocols: %x\n",
category->protocols);
if (class) { if (class) {
finish_category (pr, category, class); finish_category (pr, category, class);
} else { } else {
@ -848,7 +929,11 @@ rua___obj_exec_class (progs_t *pr)
} }
} }
Sys_MaskPrintf (SYS_RUA_OBJ, "Finished initializing %s module\n",
PR_GetString (pr, module->name));
obj_send_load (pr); obj_send_load (pr);
Sys_MaskPrintf (SYS_RUA_OBJ, "Leaving %s module init\n",
PR_GetString (pr, module->name));
} }
static void static void
@ -1082,7 +1167,7 @@ rua_sel_get_uid (progs_t *pr)
{ {
const char *name = P_GSTRING (pr, 0); const char *name = P_GSTRING (pr, 0);
RETURN_POINTER (pr, sel_register_typed_name (pr, name, 0, 0)); RETURN_POINTER (pr, sel_register_typed_name (pr, name, "", 0));
} }
static void static void
@ -1090,7 +1175,7 @@ rua_sel_register_name (progs_t *pr)
{ {
const char *name = P_GSTRING (pr, 0); const char *name = P_GSTRING (pr, 0);
RETURN_POINTER (pr, sel_register_typed_name (pr, name, 0, 0)); RETURN_POINTER (pr, sel_register_typed_name (pr, name, "", 0));
} }
static void static void

1
tools/qwaq/main.c
View file

@ -104,6 +104,7 @@ init_qf (void)
{ {
Cvar_Init_Hash (); Cvar_Init_Hash ();
Cmd_Init_Hash (); Cmd_Init_Hash ();
Cvar_Get ("developer", "128", 0, 0, 0);
Cvar_Init (); Cvar_Init ();
Sys_Init_Cvars (); Sys_Init_Cvars ();
Cmd_Init (); Cmd_Init ();