diff --git a/cmake/bochs.cmake b/cmake/bochs.cmake index 92dcdb81..0f73e19e 100644 --- a/cmake/bochs.cmake +++ b/cmake/bochs.cmake @@ -76,7 +76,7 @@ if(BUILD_BOCHS) set(bochs_src_dir ${PROJECT_SOURCE_DIR}/simulators/bochs) set(bochs_install_prefix ${bochs_src_dir}/install CACHE STRING "FailBochs installation path") - set(bochs_configure_params --enable-a20-pin --enable-x86-64 --enable-cpu-level=6 --enable-ne2000 --enable-acpi --enable-pci --enable-usb --enable-trace-cache --enable-fast-function-calls --enable-host-specific-asms --enable-disasm --enable-readline --enable-clgd54xx --enable-fpu --enable-vmx=2 --enable-monitor-mwait --enable-cdrom --enable-sb16=linux --enable-gdb-stub CACHE STRING "Bochs default configure parameters") + set(bochs_configure_params --enable-a20-pin --enable-x86-64 --enable-cpu-level=6 --enable-ne2000 --enable-acpi --enable-pci --enable-usb --enable-trace-cache --enable-fast-function-calls --enable-host-specific-asms --enable-disasm --enable-readline --enable-clgd54xx --enable-fpu --enable-vmx=2 --enable-monitor-mwait --enable-cdrom --enable-sb16=linux --enable-gdb-stub --disable-docbook --with-all-libs CACHE STRING "Bochs default configure parameters") ## Bochs CXX args for calling make set(bochs_build_CXX CXX=ag++\ -p\ ${PROJECT_SOURCE_DIR}\ -I${PROJECT_SOURCE_DIR}/src/core\ -I${CMAKE_BINARY_DIR}/src/core\ ${CMAKE_AGPP_FLAGS}\ --Xcompiler) diff --git a/doc/how-to-build.txt b/doc/how-to-build.txt index 1d868293..0b43826b 100644 --- a/doc/how-to-build.txt +++ b/doc/how-to-build.txt @@ -126,9 +126,9 @@ FailBochs: Bochs configuration features The autotools-based bochs is configured within the Fail* build run. The configuration flags can be set within the ccmake configuration (ccmake ${FAIL_DIR}/build) - Sufficient: - --enable-cpu-level=6;--enable-ne2000;--enable-trace-cache;--enable-gdb-stub --disable-docbook + --enable-cpu-level=6;--enable-ne2000;--enable-trace-cache;--enable-gdb-stub;--disable-docbook - More simulator features (FailBochs default configuration): - --enable-a20-pin;--enable-x86-64;--enable-cpu-level=6;--enable-ne2000;--enable-acpi;--enable-pci;--enable-usb;--enable-trace-cache;--enable-fast-function-calls;--enable-host-specific-asms;--enable-disasm;--enable-readline;--enable-clgd54xx;--enable-fpu;--enable-vmx=2;--enable-monitor-mwait;--enable-cdrom;--enable-sb16=linux;--enable-gdb-stub --disable-docbook --with-all-libs + --enable-a20-pin;--enable-x86-64;--enable-cpu-level=6;--enable-ne2000;--enable-acpi;--enable-pci;--enable-usb;--enable-trace-cache;--enable-fast-function-calls;--enable-host-specific-asms;--enable-disasm;--enable-readline;--enable-clgd54xx;--enable-fpu;--enable-vmx=2;--enable-monitor-mwait;--enable-cdrom;--enable-sb16=linux;--enable-gdb-stub;--disable-docbook;--with-all-libs Instead of --with-all-libs, you could use --with-nogui for "headless" experiments, additionally removing lots of library dependencies (thus reducing startup overhead). --with-x11 enables only the "x" (X11), --with-wx only the "wx" (wxWidgets) GUI. diff --git a/src/core/util/ElfReader.hpp b/src/core/util/ElfReader.hpp index f690a7d2..1722e0e0 100644 --- a/src/core/util/ElfReader.hpp +++ b/src/core/util/ElfReader.hpp @@ -24,9 +24,9 @@ namespace fail { int m_symbol_type; public: - enum { SECTION = 1, SYMBOL = 2, UNDEFINED = 3, }; + enum { SECTION = 1, SYMBOL = 2, UNDEF = 3, }; - ElfSymbol(const std::string & name = ELF::NOTFOUND, guest_address_t addr = ADDR_INV, size_t size = -1, int type = UNDEFINED, + ElfSymbol(const std::string & name = ELF::NOTFOUND, guest_address_t addr = ADDR_INV, size_t size = -1, int type = UNDEF, int symbol_type = 0) : name(name), address(addr), size(size), m_type(type), m_symbol_type(symbol_type) {};