valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

crX-exceptions for full core

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2233
This commit is contained in:
Sebastian Strohhäcker 2005-07-09 13:07:48 +00:00
parent d9552a7bae
commit 7ab3a9f466
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cpu/core_full/op.h
View file

@ -442,17 +442,17 @@ switch (inst.code.op) {
}
case 6: /* LMSW */
FillFlags();
CPU_LMSW(inst.op1.w);
if (CPU_LMSW(inst.op1.w)) RunException();
goto nextopcode;
default:
LOG(LOG_CPU,LOG_ERROR)("Group 7 Illegal subfunction %X",inst.rm_index);
}
break;
case O_M_CRx_Rd:
CPU_SET_CRX(inst.rm_index,inst.op1.d);
if (CPU_WRITE_CRX(inst.rm_index,inst.op1.d)) RunException();
break;
case O_M_Rd_CRx:
inst.op1.d=CPU_GET_CRX(inst.rm_index);
if (CPU_READ_CRX(inst.rm_index,inst.op1.d)) RunException();
break;
case O_M_DRx_Rd:
// LOG(LOG_CPU,LOG_NORMAL)("MOV DR%d,%X",inst.rm_index,inst.op1.d);

14
src/cpu/cpu.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: cpu.cpp,v 1.71 2005-07-04 20:20:18 c2woody Exp $ */
/* $Id: cpu.cpp,v 1.72 2005-07-09 13:07:48 c2woody Exp $ */
#include <assert.h>
#include "dosbox.h"
@ -52,6 +52,7 @@ void CPU_Core_Simple_Init(void);
void CPU_Core_Dyn_X86_Init(void);
#define EXCEPTION_UD 6
#define EXCEPTION_TS 10
#define EXCEPTION_NP 11
#define EXCEPTION_SS 12
@ -1430,8 +1431,10 @@ void CPU_SET_CRX(Bitu cr,Bitu value) {
}
bool CPU_WRITE_CRX(Bitu cr,Bitu value) {
if (cpu.pmode && GETFLAG(VM)) return CPU_PrepareException(EXCEPTION_GP,0);
else CPU_SET_CRX(cr,value);
/* Check if privileged to access control registers */
if (cpu.pmode && (cpu.cpl>0)) return CPU_PrepareException(EXCEPTION_GP,0);
if ((cr==1) || (cr>4)) return CPU_PrepareException(EXCEPTION_UD,0);
CPU_SET_CRX(cr,value);
return false;
}
@ -1451,7 +1454,9 @@ Bitu CPU_GET_CRX(Bitu cr) {
}
bool CPU_READ_CRX(Bitu cr,Bit32u & retvalue) {
if (cpu.pmode && GETFLAG(VM)) return CPU_PrepareException(EXCEPTION_GP,0);
/* Check if privileged to access control registers */
if (cpu.pmode && (cpu.cpl>0)) return CPU_PrepareException(EXCEPTION_GP,0);
if ((cr==1) || (cr>4)) return CPU_PrepareException(EXCEPTION_UD,0);
retvalue=CPU_GET_CRX(cr);
return false;
}
@ -1462,6 +1467,7 @@ void CPU_SMSW(Bitu & word) {
}
Bitu CPU_LMSW(Bitu word) {
if (cpu.pmode && (cpu.cpl>0)) return CPU_PrepareException(EXCEPTION_GP,0);
word&=0xf;
if (cpu.cr0 & 1) word|=1;
word|=(cpu.cr0&0xfffffff0);