allow debug to compile

This commit is contained in:
todd 2001-02-12 18:19:56 +00:00
parent 1a9e64cc62
commit f63f68610d
2 changed files with 337 additions and 0 deletions

View File

@ -0,0 +1,100 @@
$OpenBSD: patch-debug_dbg_main_cc,v 1.1 2001/02/12 18:19:56 todd Exp $
--- debug/dbg_main.cc.orig Mon Feb 12 12:10:54 2001
+++ debug/dbg_main.cc Mon Feb 12 12:08:13 2001
@@ -561,7 +561,7 @@ bx_dbg_exit(int code)
bx_dbg_callback[1].atexit();
#endif
- bx_atexit();
+ bio->atexit();
fprintf(stderr, "before exit\n");
exit(code);
@@ -832,8 +832,8 @@ bx_dbg_record_command(char* path_quoted)
if (path_quoted[len - 1] == '"')
path_quoted[len - 1] = '\0';
- bx_dbg.record_io = fopen(path_quoted, "w");
- if (bx_dbg.record_io)
+ bio->getdbg().record_io = fopen(path_quoted, "w");
+ if (bio->getdbg().record_io)
fprintf(stderr, "IO record file '%s' opened\n", path_quoted);
else
fprintf(stderr, "Error opening '%s' for writing\n", path_quoted);
@@ -1010,31 +1010,31 @@ void bx_dbg_show_command(char* arg)
dbg_dump_table(0);
return;
} else if(!strcmp(arg,"\"dbg-all\"")){
- bx_dbg.floppy = 1;
- bx_dbg.keyboard = 1;
- bx_dbg.video = 1;
- bx_dbg.disk = 1;
- bx_dbg.pit = 1;
- bx_dbg.pic = 1;
- bx_dbg.bios = 1;
- bx_dbg.cmos = 1;
- bx_dbg.a20 = 1;
- bx_dbg.interrupts = 1;
- bx_dbg.exceptions = 1;
- bx_dbg.unsupported = 1;
- bx_dbg.temp = 1;
- bx_dbg.reset = 1;
- bx_dbg.mouse = 1;
- bx_dbg.io = 1;
- bx_dbg.debugger = 1;
- bx_dbg.xms = 1;
- bx_dbg.v8086 = 1;
- bx_dbg.paging = 1;
- bx_dbg.creg = 1;
- bx_dbg.dreg = 1;
- bx_dbg.dma = 1;
- bx_dbg.unsupported_io = 1;
- /* bx_dbg.record_io = 1; this is a pointer .. somewhere */
+ bio->getdbg().floppy = 1;
+ bio->getdbg().keyboard = 1;
+ bio->getdbg().video = 1;
+ bio->getdbg().disk = 1;
+ bio->getdbg().pit = 1;
+ bio->getdbg().pic = 1;
+ bio->getdbg().bios = 1;
+ bio->getdbg().cmos = 1;
+ bio->getdbg().a20 = 1;
+ bio->getdbg().interrupts = 1;
+ bio->getdbg().exceptions = 1;
+ bio->getdbg().unsupported = 1;
+ bio->getdbg().temp = 1;
+ bio->getdbg().reset = 1;
+ bio->getdbg().mouse = 1;
+ bio->getdbg().io = 1;
+ bio->getdbg().debugger = 1;
+ bio->getdbg().xms = 1;
+ bio->getdbg().v8086 = 1;
+ bio->getdbg().paging = 1;
+ bio->getdbg().creg = 1;
+ bio->getdbg().dreg = 1;
+ bio->getdbg().dma = 1;
+ bio->getdbg().unsupported_io = 1;
+ /* bio->getdbg().record_io = 1; this is a pointer .. somewhere */
printf("Turned on all bx_dbg flags\n");
return;
} else {
@@ -1089,7 +1089,7 @@ enter_playback_entry()
last_playback_time = time;
if (diff < 0) {
- bx_panic("Negative diff in playback");
+ bio->panic("Negative diff in playback");
} else if (diff == 0) {
playback_entry.trigger();
} else {
@@ -3184,8 +3184,8 @@ bx_dbg_doit_command(unsigned n)
- bx_dbg.interrupts = n;
- bx_dbg.exceptions = n;
+ bio->getdbg().interrupts = n;
+ bio->getdbg().exceptions = n;
}
void

View File

@ -0,0 +1,237 @@
$OpenBSD: patch-disasm_dis_decode_cc,v 1.1 2001/02/12 18:19:57 todd Exp $
--- disasm/dis_decode.cc.orig Mon Feb 12 12:10:19 2001
+++ disasm/dis_decode.cc Mon Feb 12 12:12:31 2001
@@ -232,7 +232,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("verw "); Ew(); goto done;
case 0x06: invalid_opcode(); goto done;
case 0x07: invalid_opcode(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
case 0x01: /* Group 7 */
@@ -247,7 +247,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: invalid_opcode(); goto done;
case 0x06: dis_sprintf("lmsw "); Ew(); goto done;
case 0x07: invalid_opcode(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -458,7 +458,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("bts "); EvIb(); goto done;
case 0x06: dis_sprintf("btr "); EvIb(); goto done;
case 0x07: dis_sprintf("btc "); EvIb(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -536,7 +536,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0xFE:
case 0xFF: invalid_opcode(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -699,7 +699,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("sub "); EbIb(); goto done;
case 0x06: dis_sprintf("xor "); EbIb(); goto done;
case 0x07: dis_sprintf("cmp "); EbIb(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
break;
@@ -716,7 +716,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("sub "); EvIv(); goto done;
case 0x06: dis_sprintf("xor "); EvIv(); goto done;
case 0x07: dis_sprintf("cmp "); EvIv(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -734,7 +734,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("sub "); EvIb(); goto done;
case 0x06: dis_sprintf("xor "); EvIb(); goto done;
case 0x07: dis_sprintf("cmp "); EvIb(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -826,7 +826,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("shr "); EbIb(); goto done;
case 0x06: invalid_opcode(); goto done;
case 0x07: dis_sprintf("sar "); EbIb(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -842,7 +842,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("shr "); EvIb(); goto done;
case 0x06: invalid_opcode(); goto done;
case 0x07: dis_sprintf("sar "); EvIb(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -874,7 +874,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("shr "); Eb1(); goto done;
case 0x06: invalid_opcode(); goto done;
case 0x07: dis_sprintf("sar "); Eb1(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -890,7 +890,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("shr "); Ev1(); goto done;
case 0x06: invalid_opcode(); goto done;
case 0x07: dis_sprintf("sar "); Ev1(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -906,7 +906,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("shr "); Eb(); dis_sprintf(", CL"); goto done;
case 0x06: invalid_opcode(); goto done;
case 0x07: dis_sprintf("sar "); Eb(); dis_sprintf(", CL"); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -922,7 +922,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("shr "); Ev(); dis_sprintf(", CL"); goto done;
case 0x06: invalid_opcode(); goto done;
case 0x07: dis_sprintf("sar "); Ev(); dis_sprintf(", CL"); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -944,7 +944,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("fsubr "); Es(); goto done;
case 0x06: dis_sprintf("fdiv "); Es(); goto done;
case 0x07: dis_sprintf("fdivr "); Es(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
else { /* mod == 3 */
@@ -957,7 +957,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("fsubr "); ST_STi(); goto done;
case 0x06: dis_sprintf("fdiv "); ST_STi(); goto done;
case 0x07: dis_sprintf("fdivr "); ST_STi(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
goto done;
@@ -975,7 +975,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("fldcw "); Ew(); goto done;
case 0x06: dis_sprintf("fstenv "); Ea(); goto done;
case 0x07: dis_sprintf("fstcw "); Ew(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
else { /* mod == 3 */
@@ -1038,7 +1038,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x06: dis_sprintf("fsin"); goto done;
case 0x07: dis_sprintf("fcos"); goto done;
}
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
goto done;
@@ -1056,7 +1056,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("fisubr "); Ed(); goto done;
case 0x06: dis_sprintf("fidiv "); Ed(); goto done;
case 0x07: dis_sprintf("fidivr "); Ed(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
else { /* mod == 3 */
@@ -1085,7 +1085,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("fld "); Et(); goto done;
case 0x06: invalid_opcode(); goto done;
case 0x07: dis_sprintf("fstp "); Et(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
else { /* mod == 3 */
@@ -1116,7 +1116,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("fsubr "); El(); goto done;
case 0x06: dis_sprintf("fdiv "); El(); goto done;
case 0x07: dis_sprintf("fdivr "); El(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
else { /* mod == 3 */
@@ -1147,7 +1147,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: invalid_opcode(); goto done;
case 0x06: dis_sprintf("fsave "); Ea(); goto done;
case 0x07: dis_sprintf("fstsw "); Ew(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
else { /* mod == 3 */
@@ -1177,7 +1177,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("fisubr "); Ew(); goto done;
case 0x06: dis_sprintf("fidiv "); Ew(); goto done;
case 0x07: dis_sprintf("fidivr "); Ew(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
else { /* mod == 3 */
@@ -1211,7 +1211,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("fild "); Eq(); goto done;
case 0x06: dis_sprintf("fbstp "); Eb(); goto done;
case 0x07: dis_sprintf("fistp "); Eq(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
}
else { /* mod == 3 */
@@ -1273,7 +1273,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("imul AL, "); Eb(); goto done;
case 0x06: dis_sprintf("div AL, "); Eb(); goto done;
case 0x07: dis_sprintf("idiv AL, "); Eb(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
@@ -1289,7 +1289,7 @@ bx_disassemble_c::disasm(Boolean is_32,
case 0x05: dis_sprintf("imul "); eAXEv(); goto done;
case 0x06: dis_sprintf("div "); eAXEv(); goto done;
case 0x07: dis_sprintf("idiv "); eAXEv(); goto done;
- default: bx_panic("debugger: invalid opcode\n"); goto done;
+ default: bio->panic("debugger: invalid opcode\n"); goto done;
}
goto done;
case 0xF8: dis_sprintf("clc"); goto done;
@@ -1324,7 +1324,7 @@ bx_disassemble_c::disasm(Boolean is_32,
goto done;
default: /* only invalid instructions left */
- bx_panic("debugger: invalid opcode\n");
+ bio->panic("debugger: invalid opcode\n");
goto done;
break;
} /* switch (next_byte) */