From 685a033d2d757ed64b6e2d07f89d628a72e2c07c Mon Sep 17 00:00:00 2001 From: Shwartsman Date: Tue, 28 Nov 2023 08:55:49 +0200 Subject: [PATCH] fixed compilation with BX_SUPPORT_VMX=1 (x86_64 = 0) --- bochs/cpu/event.cc | 2 +- bochs/cpu/paging.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bochs/cpu/event.cc b/bochs/cpu/event.cc index 1cf451dc7b..4938fcd2eb 100644 --- a/bochs/cpu/event.cc +++ b/bochs/cpu/event.cc @@ -143,7 +143,7 @@ void BX_CPU_C::HandleExtInterrupt(void) #endif Bit8u vector = interrupt_acknowledge(); -#if BX_SUPPORT_VMX +#if BX_SUPPORT_VMX >= 2 if (BX_CPU_THIS_PTR in_vmx_guest) { if (VMX_Posted_Interrupt_Processing(vector)) return; } diff --git a/bochs/cpu/paging.cc b/bochs/cpu/paging.cc index abf6d61755..c87e75b749 100644 --- a/bochs/cpu/paging.cc +++ b/bochs/cpu/paging.cc @@ -2358,7 +2358,7 @@ bool BX_CPU_C::dbg_xlate_linear2phy(bx_address laddr, bx_phy_address *phy, bx_ad if (! (pt_address & 0x1)) { offset_mask = 0x3fffffff; goto page_fault; - } + } offset_mask >>= 18; pt_address &= BX_CONST64(0x000ffffffffff000); level = 1;