Skip to content

Commit

Permalink
Whitespace fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
leecher1337 committed Apr 19, 2019
1 parent 9dce9fc commit 608b113
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion core/include/vcpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ struct vcpu_t {
struct mmio_fetch_cache mmio_fetch;
#endif // CONFIG_HAX_EPT2

uint32_t user_excbmp;
uint32_t user_excbmp;
};

#define vmx(v, field) v->vmx.field
Expand Down
2 changes: 1 addition & 1 deletion core/include/vm.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ enum exit_status {
HAX_EXIT_FAST_MMIO,
HAX_EXIT_PAGEFAULT,
HAX_EXIT_DEBUG,
HAX_EXIT_NMI
HAX_EXIT_NMI
};

enum run_flag {
Expand Down
38 changes: 19 additions & 19 deletions core/vcpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1070,11 +1070,11 @@ static void load_dirty_vmcs_fields(struct vcpu_t *vcpu)
vcpu->rflags_dirty = 1;
vcpu->debug_control_dirty = 0;
}
if ((vcpu->debug_control & HAX_DEBUG_STEP) &&
(vmx(vcpu, interruptibility_state).raw & 3u)) {
vmx(vcpu, interruptibility_state).raw &= ~3u;
vcpu->interruptibility_dirty = 1;
}
if ((vcpu->debug_control & HAX_DEBUG_STEP) &&
(vmx(vcpu, interruptibility_state).raw & 3u)) {
vmx(vcpu, interruptibility_state).raw &= ~3u;
vcpu->interruptibility_dirty = 1;
}
if (vcpu->rflags_dirty) {
vmwrite(vcpu, GUEST_RFLAGS, state->_rflags);
vcpu->rflags_dirty = 0;
Expand Down Expand Up @@ -1309,7 +1309,7 @@ static void vcpu_update_exception_bitmap(struct vcpu_t *vcpu)
if (vcpu->debug_control & HAX_DEBUG_USE_SW_BP) {
exc_bitmap |= (1u << VECTOR_BP);
}
exc_bitmap |= vcpu->user_excbmp;
exc_bitmap |= vcpu->user_excbmp;
vmwrite(vcpu, VMX_EXCEPTION_BITMAP, exc_bitmap);
}

Expand Down Expand Up @@ -2393,17 +2393,17 @@ static int exit_exc_nmi(struct vcpu_t *vcpu, struct hax_tunnel *htun)
htun->debug.dr7 = 0;
return HAX_EXIT;
}
default:
if (vcpu->user_excbmp & (1 << exit_intr_info.vector))
{
uint64_t va;
default:
if (vcpu->user_excbmp & (1 << exit_intr_info.vector))
{
uint64_t va;

htun->_exit_status = HAX_EXIT_NMI;
htun->nmi.exit_intr_info = exit_intr_info.raw;
va = vcpu->state->_cs.long_mode == 1 ? vcpu->state->_rip : vcpu->state->_cs.base + vcpu->state->_rip;
vcpu_read_guest_virtual(vcpu, va, vcpu->io_buf, INSTR_MAX_LEN, INSTR_MAX_LEN, 0);
return HAX_EXIT;
}
htun->_exit_status = HAX_EXIT_NMI;
htun->nmi.exit_intr_info = exit_intr_info.raw;
va = vcpu->state->_cs.long_mode == 1 ? vcpu->state->_rip : vcpu->state->_cs.base + vcpu->state->_rip;
vcpu_read_guest_virtual(vcpu, va, vcpu->io_buf, INSTR_MAX_LEN, INSTR_MAX_LEN, 0);
return HAX_EXIT;
}
}

if (exit_intr_info.vector == VECTOR_PF) {
Expand Down Expand Up @@ -4122,9 +4122,9 @@ void vcpu_debug(struct vcpu_t *vcpu, struct hax_debug_t *debug)

void vcpu_setexcbmp(struct vcpu_t *vcpu, uint32_t excbmp)
{
vcpu->user_excbmp = excbmp;
hax_error("set user_excbmp = %08X", vcpu->user_excbmp);
vcpu_update_exception_bitmap(vcpu);
vcpu->user_excbmp = excbmp;
hax_error("set user_excbmp = %08X", vcpu->user_excbmp);
vcpu_update_exception_bitmap(vcpu);
}

static void vcpu_dump(struct vcpu_t *vcpu, uint32_t mask, const char *caption)
Expand Down
6 changes: 3 additions & 3 deletions include/hax_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ struct hax_tunnel {
uint64_t dr6;
uint64_t dr7;
} debug;
struct {
uint32_t exit_intr_info;
} nmi;
struct {
uint32_t exit_intr_info;
} nmi;
};
uint64_t apic_base;
} PACKED;
Expand Down
8 changes: 4 additions & 4 deletions platforms/windows/hax_entry.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,10 +430,10 @@ NTSTATUS HaxVcpuControl(PDEVICE_OBJECT DeviceObject,
vcpu_debug(cvcpu, (struct hax_debug_t*)inBuf);
break;
}
case HAX_VCPU_IOCTL_SET_EXCBMP: {
vcpu_setexcbmp(cvcpu, *(uint32_t*)inBuf);
break;
}
case HAX_VCPU_IOCTL_SET_EXCBMP: {
vcpu_setexcbmp(cvcpu, *(uint32_t*)inBuf);
break;
}
default:
hax_error("Unknow vcpu ioctl %lx\n",
irpSp->Parameters.DeviceIoControl.IoControlCode);
Expand Down

0 comments on commit 608b113

Please sign in to comment.