mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

measure host stack depth during simulation to avoid excessive chainin… (#119)

Browse Source 
…g depth

never allow beyong 64K stack
This commit is contained in:
Stanislav Shwartsman 2023-11-05 07:08:36 +02:00 committed by GitHub
parent f719dbe6d1
commit 7469bcb69a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bochs/cpu/cpu.cc
View File

@ -51,6 +51,12 @@ jmp_buf BX_CPU_C::jmp_buf_env;
void BX_CPU_C::cpu_loop(void)
{
#if BX_SUPPORT_HANDLERS_CHAINING_SPEEDUPS
volatile Bit8u stack_anchor = 0;
BX_CPU_THIS_PTR cpuloop_stack_anchor = &stack_anchor;
#endif
#if BX_DEBUGGER
BX_CPU_THIS_PTR break_point = 0;
BX_CPU_THIS_PTR magic_break = 0;
@ -249,18 +255,28 @@ bxICacheEntry_c* BX_CPU_C::getICacheEntry(void)
// The function is called after taken branch instructions and tries to link the branch to the next trace
void BX_CPP_AttrRegparmN(1) BX_CPU_C::linkTrace(bxInstruction_c *i)
{
volatile Bit8u stack_anchor = 0;
#if BX_SUPPORT_SMP
if (BX_SMP_PROCESSORS > 1)
return;
#endif
#define BX_HANDLERS_CHAINING_MAX_DEPTH 1000
#define BX_HANDLERS_CHAINING_MAX_LINK_DEPTH 1000
// do not allow extreme trace link depth / avoid host stack overflow
// (could happen with badly compiled instruction handlers)
static Bit32u linkDepth = 0;
if (BX_CPU_THIS_PTR async_event || ++linkDepth > BX_HANDLERS_CHAINING_MAX_DEPTH) {
if (BX_CPU_THIS_PTR async_event || ++linkDepth > BX_HANDLERS_CHAINING_MAX_LINK_DEPTH) {
linkDepth = 0;
return;
}
#define BX_HANDLERS_CHAINING_MAX_STACK_DEPTH 0x10000
size_t stack_depth = BX_CPU_THIS_PTR cpuloop_stack_anchor - &stack_anchor;
if (stack_depth > BX_HANDLERS_CHAINING_MAX_STACK_DEPTH) {
linkDepth = 0;
return;
}

4
bochs/cpu/cpu.h
View File

@ -1139,6 +1139,10 @@ public: // for now...
static jmp_buf jmp_buf_env;
unsigned last_exception_type;
#if BX_SUPPORT_HANDLERS_CHAINING_SPEEDUPS
const volatile Bit8u *cpuloop_stack_anchor = NULL;
#endif
// Boundaries of current code page, based on EIP
bx_address eipPageBias;
Bit32u eipPageWindowSize;