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

minor coding style modifications

Browse Source
This commit is contained in:
Stanislav Shwartsman 2021-05-25 06:27:49 +00:00
parent 431b3215fd
commit 097c8f13b9
7 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bochs/cpu/apic.cc
View File

@ -76,16 +76,16 @@ int apic_bus_deliver_interrupt(Bit8u vector, apic_dest_t dest, Bit8u delivery_mo
// logical destination mode
if(dest == 0) return 0;
bool interrupt_delivered = 0;
bool interrupt_delivered = false;
for (int i=0; i<BX_NUM_LOCAL_APICS; i++) {
if(BX_CPU_APIC(i)->match_logical_addr(dest)) {
BX_CPU_APIC(i)->deliver(vector, delivery_mode, trig_mode);
interrupt_delivered = 1;
interrupt_delivered = true;
}
}
return interrupt_delivered;
return (int) interrupt_delivered;
}
}
@ -935,13 +935,13 @@ void bx_local_apic_c::print_status(void)
bool bx_local_apic_c::match_logical_addr(apic_dest_t address)
{
bool match = 0;
bool match = false;
#if BX_CPU_LEVEL >= 6
if (mode == BX_APIC_X2APIC_MODE) {
// only cluster model supported in x2apic mode
if (address == 0xffffffff) // // broadcast all
return 1;
return true;
if ((address & 0xffff0000) == (ldr & 0xffff0000))
match = ((address & ldr & 0x0000ffff) != 0);
return match;
@ -957,7 +957,7 @@ bool bx_local_apic_c::match_logical_addr(apic_dest_t address)
else if (dest_format == 0) {
// cluster model
if (address == 0xff) // broadcast all
return 1;
return true;
if ((unsigned)(address & 0xf0) == (unsigned)(ldr & 0xf0))
match = ((address & ldr & 0x0f) != 0);

10
bochs/cpu/paging.cc
View File

@ -655,7 +655,7 @@ int BX_CPU_C::check_entry_PAE(const char *s, Bit64u entry, Bit64u reserved, unsi
if (entry & PAGE_DIRECTORY_NX_BIT) {
if (rw == BX_EXECUTE) {
BX_DEBUG(("PAE %s: non-executable page fault occurred", s));
*nx_fault = 1;
*nx_fault = true;
}
}
@ -690,7 +690,7 @@ bx_phy_address BX_CPU_C::translate_linear_long_mode(bx_address laddr, Bit32u &lp
Bit64u entry[4];
BxMemtype entry_memtype[4] = { 0 };
bool nx_fault = 0;
bool nx_fault = false;
int leaf;
Bit64u offset_mask = BX_CONST64(0x0000ffffffffffff);
@ -984,7 +984,7 @@ bx_phy_address BX_CPU_C::translate_linear_PAE(bx_address laddr, Bit32u &lpf_mask
bx_phy_address entry_addr[2];
Bit64u entry[2];
BxMemtype entry_memtype[2] = { 0 };
bool nx_fault = 0;
bool nx_fault = false;
int leaf;
lpf_mask = 0xfff;
@ -1641,7 +1641,7 @@ bx_phy_address BX_CPU_C::nested_walk_long_mode(bx_phy_address guest_paddr, unsig
bx_phy_address entry_addr[4];
Bit64u entry[4];
BxMemtype entry_memtype[4] = { BX_MEMTYPE_INVALID };
bool nx_fault = 0;
bool nx_fault = false;
int leaf;
SVM_CONTROLS *ctrls = &BX_CPU_THIS_PTR vmcb.ctrls;
@ -1705,7 +1705,7 @@ bx_phy_address BX_CPU_C::nested_walk_PAE(bx_phy_address guest_paddr, unsigned rw
bx_phy_address entry_addr[2];
Bit64u entry[2];
BxMemtype entry_memtype[2] = { BX_MEMTYPE_INVALID };
bool nx_fault = 0;
bool nx_fault = false;
int leaf;
unsigned combined_access = BX_COMBINED_ACCESS_WRITE | BX_COMBINED_ACCESS_USER;

4
bochs/cpu/smm.cc
View File

@ -220,10 +220,10 @@ static unsigned smram_map[SMRAM_FIELD_LAST];
void BX_CPU_C::init_SMRAM(void)
{
static bool smram_map_ready = 0;
static bool smram_map_ready = false;
if (smram_map_ready) return;
smram_map_ready = 1;
smram_map_ready = true;
smram_map[SMRAM_FIELD_SMBASE_OFFSET] = SMRAM_TRANSLATE(0x7f00);
smram_map[SMRAM_FIELD_SMM_REVISION_ID] = SMRAM_TRANSLATE(0x7efc);

6
bochs/cpu/svm.cc
View File

@ -402,7 +402,7 @@ bool BX_CPU_C::SvmEnterLoadCheckGuestState(void)
SVM_GUEST_STATE guest;
Bit32u tmp;
unsigned n;
bool paged_real_mode = 0;
bool paged_real_mode = false;
guest.eflags = vmcb_read32(SVM_GUEST_RFLAGS);
guest.rip = vmcb_read64(SVM_GUEST_RIP);
@ -486,7 +486,7 @@ bool BX_CPU_C::SvmEnterLoadCheckGuestState(void)
if (! guest.cr0.get_PE() && guest.cr0.get_PG()) {
// special case : entering paged real mode
BX_DEBUG(("VMRUN: entering paged real mode"));
paged_real_mode = 1;
paged_real_mode = true;
guest.cr0.val32 &= ~BX_CR0_PG_MASK;
}
}
@ -894,7 +894,7 @@ void BX_CPU_C::SvmInterceptMSR(unsigned op, Bit32u msr)
BX_ASSERT(op == BX_READ || op == BX_WRITE);
bool vmexit = 1;
bool vmexit = true;
int msr_map_offset = -1;
if (msr <= 0x1fff) msr_map_offset = 0;

4
bochs/cpu/vmcs.cc
View File

@ -131,9 +131,9 @@ void BX_CPU_C::init_VMCS(void)
init_vmx_capabilities();
static bool vmcs_map_ready = 0;
static bool vmcs_map_ready = false;
if (vmcs_map_ready) return;
vmcs_map_ready = 1;
vmcs_map_ready = true;
// disable not supported encodings
for (unsigned type=0; type<16; type++) {

32
bochs/cpu/vmexit.cc
View File

@ -206,19 +206,19 @@ void BX_CPU_C::VMexit_Event(unsigned type, unsigned vector, Bit16u errcode, bool
if (! BX_CPU_THIS_PTR in_vmx_guest) return;
VMCS_CACHE *vm = &BX_CPU_THIS_PTR vmcs;
bool vmexit = 0;
bool vmexit = false;
VMX_vmexit_reason reason = VMX_VMEXIT_EXCEPTION_NMI;
switch(type) {
case BX_EXTERNAL_INTERRUPT:
reason = VMX_VMEXIT_EXTERNAL_INTERRUPT;
if (PIN_VMEXIT(VMX_VM_EXEC_CTRL1_EXTERNAL_INTERRUPT_VMEXIT))
vmexit = 1;
vmexit = true;
break;
case BX_NMI:
if (PIN_VMEXIT(VMX_VM_EXEC_CTRL1_NMI_EXITING))
vmexit = 1;
vmexit = true;
break;
case BX_PRIVILEGED_SOFTWARE_INTERRUPT:
@ -322,32 +322,32 @@ void BX_CPP_AttrRegparmN(2) BX_CPU_C::VMexit_MSR(unsigned op, Bit32u msr)
{
BX_ASSERT(BX_CPU_THIS_PTR in_vmx_guest);
bool vmexit = 0;
if (! VMEXIT(VMX_VM_EXEC_CTRL2_MSR_BITMAPS)) vmexit = 1;
bool vmexit = false;
if (! VMEXIT(VMX_VM_EXEC_CTRL2_MSR_BITMAPS)) vmexit = true;
else {
VMCS_CACHE *vm = &BX_CPU_THIS_PTR vmcs;
Bit8u field;
if (msr >= BX_VMX_HI_MSR_START) {
if (msr > BX_VMX_HI_MSR_END) vmexit = 1;
if (msr > BX_VMX_HI_MSR_END) vmexit = true;
else {
// check MSR-HI bitmaps
bx_phy_address pAddr = vm->msr_bitmap_addr + ((msr - BX_VMX_HI_MSR_START) >> 3) + 1024 + ((op == VMX_VMEXIT_RDMSR) ? 0 : 2048);
access_read_physical(pAddr, 1, &field);
BX_NOTIFY_PHY_MEMORY_ACCESS(pAddr, 1, MEMTYPE(resolve_memtype(pAddr)), BX_READ, BX_MSR_BITMAP_ACCESS, &field);
if (field & (1 << (msr & 7)))
vmexit = 1;
vmexit = true;
}
}
else {
if (msr > BX_VMX_LO_MSR_END) vmexit = 1;
if (msr > BX_VMX_LO_MSR_END) vmexit = true;
else {
// check MSR-LO bitmaps
bx_phy_address pAddr = vm->msr_bitmap_addr + (msr >> 3) + ((op == VMX_VMEXIT_RDMSR) ? 0 : 2048);
access_read_physical(pAddr, 1, &field);
BX_NOTIFY_PHY_MEMORY_ACCESS(pAddr, 1, MEMTYPE(resolve_memtype(pAddr)), BX_READ, BX_MSR_BITMAP_ACCESS, &field);
if (field & (1 << (msr & 7)))
vmexit = 1;
vmexit = true;
}
}
}
@ -368,11 +368,11 @@ void BX_CPP_AttrRegparmN(3) BX_CPU_C::VMexit_IO(bxInstruction_c *i, unsigned por
BX_ASSERT(BX_CPU_THIS_PTR in_vmx_guest);
BX_ASSERT(port <= 0xFFFF);
bool vmexit = 0;
bool vmexit = false;
if (VMEXIT(VMX_VM_EXEC_CTRL2_IO_BITMAPS)) {
// always VMEXIT on port "wrap around" case
if ((port + len) > 0x10000) vmexit = 1;
if ((port + len) > 0x10000) vmexit = true;
else {
Bit8u bitmap[2];
bx_phy_address pAddr;
@ -402,10 +402,10 @@ void BX_CPP_AttrRegparmN(3) BX_CPU_C::VMexit_IO(bxInstruction_c *i, unsigned por
combined_bitmap = (combined_bitmap << 8) | bitmap[0];
unsigned mask = ((1 << len) - 1) << (port & 7);
if (combined_bitmap & mask) vmexit = 1;
if (combined_bitmap & mask) vmexit = true;
}
}
else if (VMEXIT(VMX_VM_EXEC_CTRL2_IO_VMEXIT)) vmexit = 1;
else if (VMEXIT(VMX_VM_EXEC_CTRL2_IO_VMEXIT)) vmexit = true;
if (vmexit) {
BX_DEBUG(("VMEXIT: I/O port 0x%04x", port));
@ -520,13 +520,13 @@ Bit32u BX_CPP_AttrRegparmN(2) BX_CPU_C::VMexit_LMSW(bxInstruction_c *i, Bit32u m
VMCS_CACHE *vm = &BX_CPU_THIS_PTR vmcs;
Bit32u mask = vm->vm_cr0_mask & 0xF; /* LMSW affects only low 4 bits */
bool vmexit = 0;
bool vmexit = false;
if ((mask & msw & 0x1) != 0 && (vm->vm_cr0_read_shadow & 0x1) == 0)
vmexit = 1;
vmexit = true;
if ((mask & vm->vm_cr0_read_shadow & 0xE) != (mask & msw & 0xE))
vmexit = 1;
vmexit = true;
if (vmexit) {
BX_DEBUG(("VMEXIT: CR0 write by LMSW of value 0x%04x", msw));

28
bochs/cpu/vmx.cc
View File

@ -1053,7 +1053,7 @@ VMX_error_code BX_CPU_C::VMenterLoadCheckHostState(void)
{
VMCS_CACHE *vm = &BX_CPU_THIS_PTR vmcs;
VMCS_HOST_STATE *host_state = &vm->host_state;
bool x86_64_host = 0, x86_64_guest = 0;
bool x86_64_host = false, x86_64_guest = false;
//
// VM Host State Checks Related to Address-Space Size
@ -1061,11 +1061,11 @@ VMX_error_code BX_CPU_C::VMenterLoadCheckHostState(void)
Bit32u vmexit_ctrls = vm->vmexit_ctrls;
if (vmexit_ctrls & VMX_VMEXIT_CTRL1_HOST_ADDR_SPACE_SIZE) {
x86_64_host = 1;
x86_64_host = true;
}
Bit32u vmentry_ctrls = vm->vmentry_ctrls;
if (vmentry_ctrls & VMX_VMENTRY_CTRL1_X86_64_GUEST) {
x86_64_guest = 1;
x86_64_guest = true;
}
#if BX_SUPPORT_X86_64
@ -1339,16 +1339,16 @@ Bit32u BX_CPU_C::VMenterLoadCheckGuestState(Bit64u *qualification)
return VMX_VMEXIT_VMENTRY_FAILURE_GUEST_STATE;
}
bool v8086_guest = 0;
bool v8086_guest = false;
if (guest.rflags & EFlagsVMMask)
v8086_guest = 1;
v8086_guest = true;
bool x86_64_guest = 0; // can't be 1 if X86_64 is not supported (checked before)
bool x86_64_guest = false; // can't be 1 if X86_64 is not supported (checked before)
Bit32u vmentry_ctrls = vm->vmentry_ctrls;
#if BX_SUPPORT_X86_64
if (vmentry_ctrls & VMX_VMENTRY_CTRL1_X86_64_GUEST) {
BX_DEBUG(("VMENTER to x86-64 guest"));
x86_64_guest = 1;
x86_64_guest = true;
}
#endif
@ -1388,9 +1388,9 @@ Bit32u BX_CPU_C::VMenterLoadCheckGuestState(Bit64u *qualification)
}
#if BX_SUPPORT_VMX >= 2
bool real_mode_guest = 0;
bool real_mode_guest = false;
if (! (guest.cr0 & BX_CR0_PE_MASK))
real_mode_guest = 1;
real_mode_guest = true;
#endif
guest.cr3 = VMread_natural(VMCS_GUEST_CR3);
@ -2188,7 +2188,7 @@ void BX_CPU_C::VMenterInjectEvents(void)
}
}
bool is_INT = 0;
bool is_INT = false;
switch(type) {
case BX_EXTERNAL_INTERRUPT:
case BX_HARDWARE_EXCEPTION:
@ -2206,12 +2206,12 @@ void BX_CPU_C::VMenterInjectEvents(void)
case BX_PRIVILEGED_SOFTWARE_INTERRUPT:
BX_CPU_THIS_PTR EXT = 1;
is_INT = 1;
is_INT = true;
break;
case BX_SOFTWARE_INTERRUPT:
case BX_SOFTWARE_EXCEPTION:
is_INT = 1;
is_INT = true;
break;
default:
@ -2484,14 +2484,14 @@ void BX_CPU_C::VMexitSaveGuestState(void)
void BX_CPU_C::VMexitLoadHostState(void)
{
VMCS_HOST_STATE *host_state = &BX_CPU_THIS_PTR vmcs.host_state;
bool x86_64_host = 0;
bool x86_64_host = false;
BX_CPU_THIS_PTR tsc_offset = 0;
#if BX_SUPPORT_X86_64
Bit32u vmexit_ctrls = BX_CPU_THIS_PTR vmcs.vmexit_ctrls;
if (vmexit_ctrls & VMX_VMEXIT_CTRL1_HOST_ADDR_SPACE_SIZE) {
BX_DEBUG(("VMEXIT to x86-64 host"));
x86_64_host = 1;
x86_64_host = true;
}
#if BX_SUPPORT_VMX >= 2