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

Renamed start variable to opcode_start

Browse source 
Fixed EXCEPTION define to us opcode_start


Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1580
This commit is contained in:
Sjoerd van der Berg 2004-01-13 09:08:24 +00:00
parent 7b1abfca2d
commit 3aa903dbfc
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/core_full.cpp
View file

@ -61,7 +61,7 @@ typedef PhysPt EAPoint;
#define EXCEPTION(blah) \
{ \
Bit8u new_num=blah; \
IPPoint=inst.start_entry; \
IPPoint=inst.opcode_start; \
LEAVECORE; \
CPU_Exception(new_num,0); \
LoadIP(); \
@ -93,7 +93,7 @@ restart_core:
};
#endif
#endif
inst.start=IPPoint;
inst.opcode_start=IPPoint;
inst.entry=inst.start_entry;
inst.prefix=inst.start_prefix;
restartopcode:

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

@ -359,14 +359,14 @@ l_M_Ed:
case D_POPSEGw:
if (CPU_SetSegGeneral((SegNames)inst.code.extra,Pop_16())) {
LEAVECORE;
reg_eip-=(IPPoint-inst.start);reg_esp-=2;
reg_eip-=(IPPoint-inst.opcode_start);reg_esp-=2;
CPU_StartException();goto restart_core;
}
goto nextopcode;
case D_POPSEGd:
if (CPU_SetSegGeneral((SegNames)inst.code.extra,Pop_32())) {
LEAVECORE;
reg_eip-=(IPPoint-inst.start);reg_esp-=4;
reg_eip-=(IPPoint-inst.opcode_start);reg_esp-=4;
CPU_StartException();goto restart_core;
}
goto nextopcode;
@ -524,7 +524,7 @@ l_M_Ed:
goto nextopcode;
case D_HLT:
LEAVECORE;
CPU_HLT(IPPoint-inst.start);
CPU_HLT(IPPoint-inst.opcode_start);
return CBRET_NONE;
default:
LOG(LOG_CPU,LOG_ERROR)("LOAD:Unhandled code %d opcode %X",inst.code.load,inst.entry);

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

@ -345,7 +345,7 @@ switch (inst.code.op) {
else if (DEBUG_IntBreakpoint(inst.op1.b))
return debugCallback;
#endif
CPU_SW_Interrupt(inst.op1.b,IPPoint-inst.start);
CPU_SW_Interrupt(inst.op1.b,IPPoint-inst.opcode_start);
goto restart_core;
case O_INb:
reg_al=IO_ReadB(inst.op1.d);

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

@ -58,7 +58,7 @@ switch (inst.code.save) {
case S_SEGm:
if (CPU_SetSegGeneral((SegNames)inst.rm_index,inst.op1.w)) {
LEAVECORE;
reg_eip-=(IPPoint-inst.start);
reg_eip-=(IPPoint-inst.opcode_start);
CPU_StartException();
goto restart_core;
}
@ -66,7 +66,7 @@ switch (inst.code.save) {
case S_SEGGw:
if (CPU_SetSegGeneral((SegNames)inst.code.extra,inst.op2.w)) {
LEAVECORE;
reg_eip-=(IPPoint-inst.start);
reg_eip-=(IPPoint-inst.opcode_start);
CPU_StartException();
goto restart_core;
}
@ -75,7 +75,7 @@ switch (inst.code.save) {
case S_SEGGd:
if (CPU_SetSegGeneral((SegNames)inst.code.extra,inst.op2.w)) {
LEAVECORE;
reg_eip-=(IPPoint-inst.start);
reg_eip-=(IPPoint-inst.opcode_start);
CPU_StartException();
goto restart_core;
}

2
src/cpu/core_full/string.h
View file

@ -28,7 +28,7 @@
count_left=count-CPU_Cycles;
count=CPU_Cycles;
CPU_Cycles=0;
IPPoint=inst.start; //Reset IP to start of instruction
IPPoint=inst.opcode_start; //Reset IP to start of instruction
} else {
/* Won't interrupt scas and cmps instruction since they can interrupt themselves */
count_left=0;

2
src/cpu/core_full/support.h
View file

@ -155,7 +155,7 @@ struct OpCode {
struct FullData {
Bitu entry;
EAPoint start;
EAPoint opcode_start;
Bitu rm;
EAPoint rm_eaa;
Bitu rm_off;