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

more bx_bool -> bool also fixing bxhub.cc case where bx_bool were assigned integer -1 value

Browse Source
This commit is contained in:
Stanislav Shwartsman 2021-01-30 17:37:42 +00:00
parent 9314902a85
commit abac80801f
6 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/bxdisasm.cc
View File

@ -59,7 +59,7 @@ int main(int argn, const char **argv)
{ {
char disbuf[256]; char disbuf[256];
Bit8u ibuf[16] = {0}; Bit8u ibuf[16] = {0};
bx_bool is_32 = 1, is_64 = 0; bool is_32 = 1, is_64 = 0;
if (argn < 2) if (argn < 2)
{ {

36
bochs/memory/memory-bochs.h
View File

@ -86,11 +86,11 @@ struct memory_handler_struct {
class BOCHSAPI BX_MEM_C : public logfunctions { class BOCHSAPI BX_MEM_C : public logfunctions {
private: private:
struct memory_handler_struct **memory_handlers; struct memory_handler_struct **memory_handlers;
bx_bool pci_enabled; bool pci_enabled;
bx_bool bios_write_enabled; bool bios_write_enabled;
bx_bool smram_available; bool smram_available;
bx_bool smram_enable; bool smram_enable;
bx_bool smram_restricted; bool smram_restricted;
Bit64u len, allocated; // could be > 4G Bit64u len, allocated; // could be > 4G
Bit8u *actual_vector; Bit8u *actual_vector;
@ -98,7 +98,7 @@ private:
Bit8u **blocks; Bit8u **blocks;
Bit8u *rom; // 512k BIOS rom space + 128k expansion rom space Bit8u *rom; // 512k BIOS rom space + 128k expansion rom space
Bit8u *bogus; // 4k for unexisting memory Bit8u *bogus; // 4k for unexisting memory
bx_bool rom_present[65]; bool rom_present[65];
bx_bool memory_type[13][2]; bx_bool memory_type[13][2];
Bit32u bios_rom_addr; Bit32u bios_rom_addr;
Bit8u bios_rom_access; Bit8u bios_rom_access;
@ -125,13 +125,13 @@ public:
BX_MEM_SMF void init_memory(Bit64u guest, Bit64u host); BX_MEM_SMF void init_memory(Bit64u guest, Bit64u host);
BX_MEM_SMF void cleanup_memory(void); BX_MEM_SMF void cleanup_memory(void);
BX_MEM_SMF void enable_smram(bx_bool enable, bx_bool restricted); BX_MEM_SMF void enable_smram(bool enable, bool restricted);
BX_MEM_SMF void disable_smram(void); BX_MEM_SMF void disable_smram(void);
BX_MEM_SMF bx_bool is_smram_accessible(void); BX_MEM_SMF bool is_smram_accessible(void);
BX_MEM_SMF void set_bios_write(bx_bool enabled); BX_MEM_SMF void set_bios_write(bool enabled);
BX_MEM_SMF void set_bios_rom_access(Bit8u region, bx_bool enabled); BX_MEM_SMF void set_bios_rom_access(Bit8u region, bool enabled);
BX_MEM_SMF void set_memory_type(memory_area_t area, bx_bool rw, bx_bool dram); BX_MEM_SMF void set_memory_type(memory_area_t area, bool rw, bool dram);
BX_MEM_SMF Bit8u* getHostMemAddr(BX_CPU_C *cpu, bx_phy_address addr, unsigned rw); BX_MEM_SMF Bit8u* getHostMemAddr(BX_CPU_C *cpu, bx_phy_address addr, unsigned rw);
@ -147,29 +147,29 @@ public:
BX_MEM_SMF void load_ROM(const char *path, bx_phy_address romaddress, Bit8u type); 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); BX_MEM_SMF void load_RAM(const char *path, bx_phy_address romaddress);
BX_MEM_SMF bx_bool dbg_fetch_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, Bit8u *buf); BX_MEM_SMF bool dbg_fetch_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, Bit8u *buf);
#if (BX_DEBUGGER || BX_GDBSTUB) #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 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); BX_MEM_SMF bool dbg_crc32(bx_phy_address addr1, bx_phy_address addr2, Bit32u *crc);
#endif #endif
BX_MEM_SMF bx_bool registerMemoryHandlers(void *param, memory_handler_t read_handler, BX_MEM_SMF bool registerMemoryHandlers(void *param, memory_handler_t read_handler,
memory_handler_t write_handler, memory_direct_access_handler_t da_handler, memory_handler_t write_handler, memory_direct_access_handler_t da_handler,
bx_phy_address begin_addr, bx_phy_address end_addr); bx_phy_address begin_addr, bx_phy_address end_addr);
BX_MEM_SMF BX_CPP_INLINE bx_bool registerMemoryHandlers(void *param, memory_handler_t read_handler, BX_MEM_SMF BX_CPP_INLINE bool registerMemoryHandlers(void *param, memory_handler_t read_handler,
memory_handler_t write_handler, memory_handler_t write_handler,
bx_phy_address begin_addr, bx_phy_address end_addr) bx_phy_address begin_addr, bx_phy_address end_addr)
{ {
return registerMemoryHandlers(param, read_handler, write_handler, NULL, begin_addr, end_addr); return registerMemoryHandlers(param, read_handler, write_handler, NULL, begin_addr, end_addr);
} }
BX_MEM_SMF bx_bool unregisterMemoryHandlers(void *param, bx_phy_address begin_addr, bx_phy_address end_addr); BX_MEM_SMF bool unregisterMemoryHandlers(void *param, bx_phy_address begin_addr, bx_phy_address end_addr);
BX_MEM_SMF Bit64u get_memory_len(void); BX_MEM_SMF Bit64u get_memory_len(void);
BX_MEM_SMF void allocate_block(Bit32u index); BX_MEM_SMF void allocate_block(Bit32u index);
BX_MEM_SMF Bit8u* alloc_vector_aligned(Bit64u bytes, Bit64u alignment); BX_MEM_SMF Bit8u* alloc_vector_aligned(Bit64u bytes, Bit64u alignment);
#if BX_SUPPORT_MONITOR_MWAIT #if BX_SUPPORT_MONITOR_MWAIT
BX_MEM_SMF bx_bool is_monitor(bx_phy_address begin_addr, unsigned len); BX_MEM_SMF bool is_monitor(bx_phy_address begin_addr, unsigned len);
BX_MEM_SMF void check_monitor(bx_phy_address addr, unsigned len); BX_MEM_SMF void check_monitor(bx_phy_address addr, unsigned len);
#endif #endif

4
bochs/memory/memory.cc
View File

@ -51,7 +51,7 @@ void BX_MEM_C::writePhysicalPage(BX_CPU_C *cpu, bx_phy_address addr, unsigned le
BX_MEM_THIS check_monitor(a20addr, len); BX_MEM_THIS check_monitor(a20addr, len);
#endif #endif
bx_bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr); bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr);
#if BX_PHY_ADDRESS_LONG #if BX_PHY_ADDRESS_LONG
if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0; if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0;
#endif #endif
@ -251,7 +251,7 @@ void BX_MEM_C::readPhysicalPage(BX_CPU_C *cpu, bx_phy_address addr, unsigned len
BX_PANIC(("readPhysicalPage: cross page access at address 0x" FMT_PHY_ADDRX ", len=%d", addr, len)); BX_PANIC(("readPhysicalPage: cross page access at address 0x" FMT_PHY_ADDRX ", len=%d", addr, len));
} }
bx_bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr); bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr);
#if BX_PHY_ADDRESS_LONG #if BX_PHY_ADDRESS_LONG
if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0; if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0;
#endif #endif

40
bochs/memory/misc_mem.cc
View File

@ -193,7 +193,7 @@ void BX_MEM_C::allocate_block(Bit32u block)
if (BX_MEM_THIS used_blocks >= max_blocks) { if (BX_MEM_THIS used_blocks >= max_blocks) {
Bit32u original_replacement_block = BX_MEM_THIS next_swapout_idx; Bit32u original_replacement_block = BX_MEM_THIS next_swapout_idx;
// Find a block to replace // Find a block to replace
bx_bool used_for_tlb; bool used_for_tlb;
Bit8u *buffer; Bit8u *buffer;
do { do {
do { do {
@ -383,7 +383,7 @@ void BX_MEM_C::load_ROM(const char *path, bx_phy_address romaddress, Bit8u type)
struct stat stat_buf; struct stat stat_buf;
int fd, ret, i, start_idx, end_idx; int fd, ret, i, start_idx, end_idx;
unsigned long size, max_size, offset; unsigned long size, max_size, offset;
bx_bool is_bochs_bios = 0; bool is_bochs_bios = 0;
if (*path == '\0') { if (*path == '\0') {
if (type == 2) { if (type == 2) {
@ -575,13 +575,13 @@ void BX_MEM_C::load_RAM(const char *path, bx_phy_address ramaddress)
path)); path));
} }
bx_bool BX_MEM_C::dbg_fetch_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, Bit8u *buf) bool BX_MEM_C::dbg_fetch_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, Bit8u *buf)
{ {
bx_phy_address a20addr = A20ADDR(addr); bx_phy_address a20addr = A20ADDR(addr);
struct memory_handler_struct *memory_handler = NULL; struct memory_handler_struct *memory_handler = NULL;
bx_bool ret = 1, use_memory_handler = 0, use_smram = 0; bool ret = 1, use_memory_handler = 0, use_smram = 0;
bx_bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr); bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr);
#if BX_PHY_ADDRESS_LONG #if BX_PHY_ADDRESS_LONG
if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0; if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0;
#endif #endif
@ -670,17 +670,17 @@ bx_bool BX_MEM_C::dbg_fetch_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len
} }
#if BX_DEBUGGER || BX_GDBSTUB #if BX_DEBUGGER || BX_GDBSTUB
bx_bool BX_MEM_C::dbg_set_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, Bit8u *buf) bool BX_MEM_C::dbg_set_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, Bit8u *buf)
{ {
bx_phy_address a20addr = A20ADDR(addr); bx_phy_address a20addr = A20ADDR(addr);
struct memory_handler_struct *memory_handler = NULL; struct memory_handler_struct *memory_handler = NULL;
bx_bool use_memory_handler = 0, use_smram = 0; bool use_memory_handler = 0, use_smram = 0;
if ((a20addr + len - 1) > BX_MEM_THIS len) { if ((a20addr + len - 1) > BX_MEM_THIS len) {
return(0); // error, beyond limits of memory return(0); // error, beyond limits of memory
} }
bx_bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr); bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr);
#if BX_PHY_ADDRESS_LONG #if BX_PHY_ADDRESS_LONG
if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0; if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0;
#endif #endif
@ -730,7 +730,7 @@ bx_bool BX_MEM_C::dbg_set_mem(BX_CPU_C *cpu, bx_phy_address addr, unsigned len,
return(1); return(1);
} }
bx_bool BX_MEM_C::dbg_crc32(bx_phy_address addr1, bx_phy_address addr2, Bit32u *crc) bool BX_MEM_C::dbg_crc32(bx_phy_address addr1, bx_phy_address addr2, Bit32u *crc)
{ {
*crc = 0; *crc = 0;
if (addr1 > addr2) if (addr1 > addr2)
@ -780,12 +780,12 @@ Bit8u *BX_MEM_C::getHostMemAddr(BX_CPU_C *cpu, bx_phy_address addr, unsigned rw)
{ {
bx_phy_address a20addr = A20ADDR(addr); bx_phy_address a20addr = A20ADDR(addr);
bx_bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr); bool is_bios = (a20addr >= (bx_phy_address)BX_MEM_THIS bios_rom_addr);
#if BX_PHY_ADDRESS_LONG #if BX_PHY_ADDRESS_LONG
if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0; if (a20addr > BX_CONST64(0xffffffff)) is_bios = 0;
#endif #endif
bx_bool write = rw & 1; bool write = rw & 1;
// allow direct access to SMRAM memory space for code and veto data // allow direct access to SMRAM memory space for code and veto data
if ((cpu != NULL) && (rw == BX_EXECUTE)) { if ((cpu != NULL) && (rw == BX_EXECUTE)) {
@ -897,7 +897,7 @@ Bit8u *BX_MEM_C::getHostMemAddr(BX_CPU_C *cpu, bx_phy_address addr, unsigned rw)
/* /*
* One needs to provide both a read_handler and a write_handler. * One needs to provide both a read_handler and a write_handler.
*/ */
bx_bool bool
BX_MEM_C::registerMemoryHandlers(void *param, memory_handler_t read_handler, BX_MEM_C::registerMemoryHandlers(void *param, memory_handler_t read_handler,
memory_handler_t write_handler, memory_direct_access_handler_t da_handler, memory_handler_t write_handler, memory_direct_access_handler_t da_handler,
bx_phy_address begin_addr, bx_phy_address end_addr) bx_phy_address begin_addr, bx_phy_address end_addr)
@ -937,10 +937,10 @@ BX_MEM_C::registerMemoryHandlers(void *param, memory_handler_t read_handler,
return 1; return 1;
} }
bx_bool bool
BX_MEM_C::unregisterMemoryHandlers(void *param, bx_phy_address begin_addr, bx_phy_address end_addr) BX_MEM_C::unregisterMemoryHandlers(void *param, bx_phy_address begin_addr, bx_phy_address end_addr)
{ {
bx_bool ret = 1; bool ret = 1;
BX_INFO(("Memory access handlers unregistered: 0x" FMT_PHY_ADDRX " - 0x" FMT_PHY_ADDRX, begin_addr, end_addr)); BX_INFO(("Memory access handlers unregistered: 0x" FMT_PHY_ADDRX " - 0x" FMT_PHY_ADDRX, begin_addr, end_addr));
for (Bit32u page_idx = (Bit32u)(begin_addr >> 20); page_idx <= (Bit32u)(end_addr >> 20); page_idx++) { for (Bit32u page_idx = (Bit32u)(begin_addr >> 20); page_idx <= (Bit32u)(end_addr >> 20); page_idx++) {
Bit16u bitmap = 0xffff; Bit16u bitmap = 0xffff;
@ -974,7 +974,7 @@ BX_MEM_C::unregisterMemoryHandlers(void *param, bx_phy_address begin_addr, bx_ph
return ret; return ret;
} }
void BX_MEM_C::enable_smram(bx_bool enable, bx_bool restricted) void BX_MEM_C::enable_smram(bool enable, bool restricted)
{ {
BX_MEM_THIS smram_available = 1; BX_MEM_THIS smram_available = 1;
BX_MEM_THIS smram_enable = (enable > 0); BX_MEM_THIS smram_enable = (enable > 0);
@ -989,25 +989,25 @@ void BX_MEM_C::disable_smram(void)
} }
// check if SMRAM is aavailable for CPU data accesses // check if SMRAM is aavailable for CPU data accesses
bx_bool BX_MEM_C::is_smram_accessible(void) bool BX_MEM_C::is_smram_accessible(void)
{ {
return(BX_MEM_THIS smram_available) && return(BX_MEM_THIS smram_available) &&
(BX_MEM_THIS smram_enable || !BX_MEM_THIS smram_restricted); (BX_MEM_THIS smram_enable || !BX_MEM_THIS smram_restricted);
} }
void BX_MEM_C::set_memory_type(memory_area_t area, bx_bool rw, bx_bool dram) void BX_MEM_C::set_memory_type(memory_area_t area, bool rw, bool dram)
{ {
if (area <= BX_MEM_AREA_F0000) { if (area <= BX_MEM_AREA_F0000) {
BX_MEM_THIS memory_type[area][rw] = dram; BX_MEM_THIS memory_type[area][rw] = dram;
} }
} }
void BX_MEM_C::set_bios_write(bx_bool enabled) void BX_MEM_C::set_bios_write(bool enabled)
{ {
BX_MEM_THIS bios_write_enabled = enabled; BX_MEM_THIS bios_write_enabled = enabled;
} }
void BX_MEM_C::set_bios_rom_access(Bit8u region, bx_bool enabled) void BX_MEM_C::set_bios_rom_access(Bit8u region, bool enabled)
{ {
if (enabled) { if (enabled) {
BX_MEM_THIS bios_rom_access |= region; BX_MEM_THIS bios_rom_access |= region;
@ -1110,7 +1110,7 @@ void BX_MEM_C::flash_write(Bit32u addr, Bit8u data)
// MONITOR/MWAIT - x86arch way to optimize idle loops in CPU // MONITOR/MWAIT - x86arch way to optimize idle loops in CPU
// //
bx_bool BX_MEM_C::is_monitor(bx_phy_address begin_addr, unsigned len) bool BX_MEM_C::is_monitor(bx_phy_address begin_addr, unsigned len)
{ {
for (int i=0; i<BX_SMP_PROCESSORS;i++) { for (int i=0; i<BX_SMP_PROCESSORS;i++) {
if (BX_CPU(i)->is_monitor(begin_addr, len)) if (BX_CPU(i)->is_monitor(begin_addr, len))

6
bochs/misc/bxhub.cc
View File

@ -76,7 +76,7 @@ typedef struct {
Bit8u id; Bit8u id;
SOCKET so; SOCKET so;
struct sockaddr_in sin, sout; struct sockaddr_in sin, sout;
bx_bool init; int init;
Bit8u macaddr[6]; Bit8u macaddr[6];
Bit8u default_ipv4addr[4]; Bit8u default_ipv4addr[4];
Bit8u *reply_buffer; Bit8u *reply_buffer;
@ -104,7 +104,7 @@ int bx_loglev;
static char bx_logfname[BX_PATHNAME_LEN]; static char bx_logfname[BX_PATHNAME_LEN];
bx_bool handle_packet(hub_client_t *client, Bit8u *buf, unsigned len) bool handle_packet(hub_client_t *client, Bit8u *buf, unsigned len)
{ {
ethernet_header_t *ethhdr = (ethernet_header_t *)buf; ethernet_header_t *ethhdr = (ethernet_header_t *)buf;
@ -144,7 +144,7 @@ void broadcast_packet(int clientid, Bit8u *buf, unsigned len)
} }
} }
bx_bool find_client(Bit8u *dst_mac_addr, int *clientid) bool find_client(Bit8u *dst_mac_addr, int *clientid)
{ {
*clientid = -1; *clientid = -1;
for (int i = 0; i < client_max; i++) { for (int i = 0; i < client_max; i++) {

8
bochs/misc/bximage.cc
View File

@ -425,7 +425,7 @@ void convert_image(const char *newimgmode, Bit64u newsize)
Bit64u i, sc, s; Bit64u i, sc, s;
char buffer[512], null_sector[512]; char buffer[512], null_sector[512];
const char *imgmode = NULL; const char *imgmode = NULL;
bx_bool error = 0; bool error = false;
printf("\n"); printf("\n");
memset(null_sector, 0, 512); memset(null_sector, 0, 512);
@ -472,17 +472,17 @@ void convert_image(const char *newimgmode, Bit64u newsize)
printf("\x8\x8\x8\x8\x8%3d%%]", (int)((s+1)*100/sc)); printf("\x8\x8\x8\x8\x8%3d%%]", (int)((s+1)*100/sc));
fflush(stdout); fflush(stdout);
if (source_image->lseek(i, SEEK_SET) < 0) { if (source_image->lseek(i, SEEK_SET) < 0) {
error = 1; error = true;
break; break;
} }
if ((source_image->read(buffer, 512) == 512) && if ((source_image->read(buffer, 512) == 512) &&
(memcmp(buffer, null_sector, 512) != 0)) { (memcmp(buffer, null_sector, 512) != 0)) {
if (dest_image->lseek(i, SEEK_SET) < 0) { if (dest_image->lseek(i, SEEK_SET) < 0) {
error = 1; error = true;
break; break;
} }
if (dest_image->write(buffer, 512) < 0) { if (dest_image->write(buffer, 512) < 0) {
error = 1; error = true;
break; break;
} }
} }