From bea432dacb615b403d31fdfc0854da23aad1954a Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Sat, 2 Jan 2021 14:04:35 +0000
Subject: [PATCH] fixed compilation with no debugger configured in

---
 bochs/cpu/cpu.h             | 2 --
 bochs/cpu/paging.cc         | 4 ----
 bochs/memory/memory-bochs.h | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/bochs/cpu/cpu.h b/bochs/cpu/cpu.h
index 647ccbff3..4e3ab9b0a 100644
--- a/bochs/cpu/cpu.h
+++ b/bochs/cpu/cpu.h
@@ -4283,12 +4283,10 @@ public: // for now...
 #if BX_DEBUGGER || BX_GDBSTUB
   BX_SMF bx_bool  dbg_instruction_epilog(void);
 #endif
-#if BX_DEBUGGER || BX_INSTRUMENTATION || BX_GDBSTUB
   BX_SMF bx_bool  dbg_xlate_linear2phy(bx_address linear, bx_phy_address *phy, bx_address *lpf_mask = 0, bx_bool verbose = 0);
 #if BX_SUPPORT_VMX >= 2
   BX_SMF bx_bool dbg_translate_guest_physical(bx_phy_address guest_paddr, bx_phy_address *phy, bx_bool verbose = 0);
 #endif
-#endif
 #if BX_LARGE_RAMFILE
   BX_SMF bx_bool check_addr_in_tlb_buffers(const Bit8u *addr, const Bit8u *end);
 #endif
diff --git a/bochs/cpu/paging.cc b/bochs/cpu/paging.cc
index f9d006afa..b8b18e04e 100644
--- a/bochs/cpu/paging.cc
+++ b/bochs/cpu/paging.cc
@@ -2148,8 +2148,6 @@ bx_bool BX_CPU_C::spp_walk(bx_phy_address guest_paddr, bx_address guest_laddr, B
 
 #endif
 
-#if BX_DEBUGGER || BX_INSTRUMENTATION || BX_GDBSTUB
-
 #if BX_DEBUGGER
 
 void dbg_print_paging_pte(int level, Bit64u entry)
@@ -2384,8 +2382,6 @@ page_fault:
   return 0;
 }
 
-#endif // BX_DEBUGGER || BX_INSTRUMENTATION || BX_GDBSTUB
-
 int BX_CPU_C::access_write_linear(bx_address laddr, unsigned len, unsigned curr_pl, unsigned xlate_rw, Bit32u ac_mask, void *data)
 {
 #if BX_SUPPORT_CET
diff --git a/bochs/memory/memory-bochs.h b/bochs/memory/memory-bochs.h
index 3f1e148b4..bfa42419b 100644
--- a/bochs/memory/memory-bochs.h
+++ b/bochs/memory/memory-bochs.h
@@ -147,8 +147,8 @@ public:
   BX_MEM_SMF void    load_ROM(const char *path, bx_phy_address romaddress, Bit8u type);
   BX_MEM_SMF void    load_RAM(const char *path, bx_phy_address romaddress);
 
-#if (BX_DEBUGGER || BX_GDBSTUB)
   BX_MEM_SMF bx_bool dbg_fetch_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, Bit8u *buf);
+#if (BX_DEBUGGER || BX_GDBSTUB)
   BX_MEM_SMF bx_bool dbg_set_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, Bit8u *buf);
   BX_MEM_SMF bx_bool dbg_crc32(bx_phy_address addr1, bx_phy_address addr2, Bit32u *crc);
 #endif