mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- since the print_tree() function is only used by the debugger, it has to use 

dbg_printf() to make the redirection of the output to a gui frontend possible
This commit is contained in:
Volker Ruppert 2006-11-12 21:25:06 +00:00
parent 3dd9df62c7
commit ed3a41ac63
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/config.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.111 2006-10-08 10:18:50 vruppert Exp $ // $Id: config.cc,v 1.112 2006-11-12 21:25:06 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -1612,10 +1612,6 @@ void bx_init_options()
}; };
menu = new bx_list_c(special_menus, "runtime", "Misc runtime options", runtime_init_list); menu = new bx_list_c(special_menus, "runtime", "Misc runtime options", runtime_init_list);
menu->get_options()->set(bx_list_c::SHOW_PARENT | bx_list_c::SHOW_GROUP_NAME); menu->get_options()->set(bx_list_c::SHOW_PARENT | bx_list_c::SHOW_GROUP_NAME);
// param-tree test output
//printf("parameter tree:\n");
//print_tree(root_param, 0);
} }
void bx_reset_options() void bx_reset_options()

26
bochs/main.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.348 2006-10-26 17:27:04 vruppert Exp $ // $Id: main.cc,v 1.349 2006-11-12 21:25:06 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -185,30 +185,31 @@ static void carbonFatalDialog(const char *error, const char *exposition)
} }
#endif #endif
#if BX_DEBUGGER
void print_tree(bx_param_c *node, int level) void print_tree(bx_param_c *node, int level)
{ {
int i; int i;
char tmpstr[BX_PATHNAME_LEN], tmpbyte[4]; char tmpstr[BX_PATHNAME_LEN], tmpbyte[4];
for (i=0; i<level; i++) for (i=0; i<level; i++)
printf (" "); dbg_printf(" ");
if (node == NULL) { if (node == NULL) {
printf("NULL pointer\n"); dbg_printf("NULL pointer\n");
return; return;
} }
switch (node->get_type()) { switch (node->get_type()) {
case BXT_PARAM_NUM: case BXT_PARAM_NUM:
if (((bx_param_num_c*)node)->get_base() == BASE_DEC) { if (((bx_param_num_c*)node)->get_base() == BASE_DEC) {
printf("%s = " FMT_LL "d (number)\n", node->get_name(), ((bx_param_num_c*)node)->get64()); dbg_printf("%s = " FMT_LL "d (number)\n", node->get_name(), ((bx_param_num_c*)node)->get64());
} else { } else {
printf("%s = 0x" FMT_LL "x (hex number)\n", node->get_name(), ((bx_param_num_c*)node)->get64()); dbg_printf("%s = 0x" FMT_LL "x (hex number)\n", node->get_name(), ((bx_param_num_c*)node)->get64());
} }
break; break;
case BXT_PARAM_BOOL: case BXT_PARAM_BOOL:
printf("%s = %s (boolean)\n", node->get_name(), ((bx_param_bool_c*)node)->get()?"true":"false"); dbg_printf("%s = %s (boolean)\n", node->get_name(), ((bx_param_bool_c*)node)->get()?"true":"false");
break; break;
case BXT_PARAM_ENUM: case BXT_PARAM_ENUM:
printf("%s = '%s' (enum)\n", node->get_name(), ((bx_param_enum_c*)node)->get_selected()); dbg_printf("%s = '%s' (enum)\n", node->get_name(), ((bx_param_enum_c*)node)->get_selected());
break; break;
case BXT_PARAM_STRING: case BXT_PARAM_STRING:
if (((bx_param_string_c*)node)->get_options()->get() & bx_param_string_c::RAW_BYTES) { if (((bx_param_string_c*)node)->get_options()->get() & bx_param_string_c::RAW_BYTES) {
@ -222,14 +223,14 @@ void print_tree(bx_param_c *node, int level)
sprintf(tmpbyte, "%02x", (Bit8u)((bx_param_string_c*)node)->getptr()[i]); sprintf(tmpbyte, "%02x", (Bit8u)((bx_param_string_c*)node)->getptr()[i]);
strcat(tmpstr, tmpbyte); strcat(tmpstr, tmpbyte);
} }
printf("%s = '%s' (raw byte string)\n", node->get_name(), tmpstr); dbg_printf("%s = '%s' (raw byte string)\n", node->get_name(), tmpstr);
} else { } else {
printf("%s = '%s' (string)\n", node->get_name(), ((bx_param_string_c*)node)->getptr()); dbg_printf("%s = '%s' (string)\n", node->get_name(), ((bx_param_string_c*)node)->getptr());
} }
break; break;
case BXT_LIST: case BXT_LIST:
{ {
printf("%s = \n", node->get_name()); dbg_printf("%s = \n", node->get_name());
bx_list_c *list = (bx_list_c*)node; bx_list_c *list = (bx_list_c*)node;
for (i=0; i < list->get_size(); i++) { for (i=0; i < list->get_size(); i++) {
print_tree(list->get(i), level+1); print_tree(list->get(i), level+1);
@ -238,13 +239,14 @@ void print_tree(bx_param_c *node, int level)
} }
#if BX_SUPPORT_SAVE_RESTORE #if BX_SUPPORT_SAVE_RESTORE
case BXT_PARAM_DATA: case BXT_PARAM_DATA:
printf("%s = 'size=%d' (binary data)\n", node->get_name(), ((bx_shadow_data_c*)node)->get_size()); dbg_printf("%s = 'size=%d' (binary data)\n", node->get_name(), ((bx_shadow_data_c*)node)->get_size());
break; break;
#endif #endif
default: default:
printf("%s (unknown parameter type)\n", node->get_name()); dbg_printf("%s (unknown parameter type)\n", node->get_name());
} }
} }
#endif
int bxmain () { int bxmain () {
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H