mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some MSVC warnings in the cpu code (unsafe use of bool type).

This commit is contained in:
Volker Ruppert 2021-07-27 19:18:34 +00:00
parent a1058990ba
commit 4c32ca7b16
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/cpu/paging.cc
View File

@ -2,7 +2,7 @@
// $Id$ // $Id$
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001-2019 The Bochs Project // Copyright (C) 2001-2021 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -824,7 +824,7 @@ bx_phy_address BX_CPU_C::translate_linear_long_mode(bx_address laddr, Bit32u &lp
unsigned priv_index = (BX_CPU_THIS_PTR cr0.get_WP() << 4) | // bit 4 unsigned priv_index = (BX_CPU_THIS_PTR cr0.get_WP() << 4) | // bit 4
(user<<3) | // bit 3 (user<<3) | // bit 3
(combined_access | isWrite); // bit 2,1,0 (combined_access | (unsigned)isWrite);// bit 2,1,0
if (!priv_check[priv_index] || nx_fault) if (!priv_check[priv_index] || nx_fault)
page_fault(ERROR_PROTECTION, laddr, user, rw); page_fault(ERROR_PROTECTION, laddr, user, rw);
@ -1071,7 +1071,7 @@ bx_phy_address BX_CPU_C::translate_linear_PAE(bx_address laddr, Bit32u &lpf_mask
unsigned priv_index = (BX_CPU_THIS_PTR cr0.get_WP() << 4) | // bit 4 unsigned priv_index = (BX_CPU_THIS_PTR cr0.get_WP() << 4) | // bit 4
(user<<3) | // bit 3 (user<<3) | // bit 3
(combined_access | isWrite); // bit 2,1,0 (combined_access | (unsigned)isWrite);// bit 2,1,0
if (!priv_check[priv_index] || nx_fault) if (!priv_check[priv_index] || nx_fault)
page_fault(ERROR_PROTECTION, laddr, user, rw); page_fault(ERROR_PROTECTION, laddr, user, rw);
@ -1221,7 +1221,7 @@ bx_phy_address BX_CPU_C::translate_linear_legacy(bx_address laddr, Bit32u &lpf_m
(BX_CPU_THIS_PTR cr0.get_WP() << 4) | // bit 4 (BX_CPU_THIS_PTR cr0.get_WP() << 4) | // bit 4
#endif #endif
(user<<3) | // bit 3 (user<<3) | // bit 3
(combined_access | isWrite); // bit 2,1,0 (combined_access | (unsigned)isWrite); // bit 2,1,0
if (!priv_check[priv_index]) if (!priv_check[priv_index])
page_fault(ERROR_PROTECTION, laddr, user, rw); page_fault(ERROR_PROTECTION, laddr, user, rw);