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

fixes for 32-bit mode only compilation

Browse Source
This commit is contained in:
Stanislav Shwartsman 2019-02-16 19:42:04 +00:00
parent bfd7bb2c13
commit cd79d22113
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/cpu/avx/avx512.cc
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2013-2018 Stanislav Shwartsman
// Copyright (c) 2013-2019 Stanislav Shwartsman
// Written by Stanislav Shwartsman [sshwarts at sourceforge net]
//
// This library is free software; you can redistribute it and/or

4
bochs/cpu/decoder/fetchdecode_opmap.h
View File

@ -1628,7 +1628,9 @@ static const Bit64u BxOpcodeTable0F20[] = {
// opcode 0F 21
static const Bit64u BxOpcodeTable0F21[] = {
#if BX_SUPPORT_X86_64
form_opcode(ATTR_IS64, BX_IA_MOV_RqDq),
#endif
last_opcode(ATTR_IS32, BX_IA_MOV_RdDd)
};
@ -1648,7 +1650,9 @@ static const Bit64u BxOpcodeTable0F22[] = {
// opcode 0F 23
static const Bit64u BxOpcodeTable0F23[] = {
#if BX_SUPPORT_X86_64
form_opcode(ATTR_IS64, BX_IA_MOV_DqRq),
#endif
last_opcode(ATTR_IS32, BX_IA_MOV_DdRd)
};

3
bochs/cpu/vmx.cc
View File

@ -2317,11 +2317,10 @@ void BX_CPU_C::VMexitLoadHostState(void)
{
VMCS_HOST_STATE *host_state = &BX_CPU_THIS_PTR vmcs.host_state;
bx_bool x86_64_host = 0;
Bit32u vmexit_ctrls = BX_CPU_THIS_PTR vmcs.vmexit_ctrls;
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;