Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved more variables into cpu_state structure.

Browse source
This commit is contained in:
SarahW 2016-08-21 21:28:23 +01:00
commit eb126fd822
50 changed files with 1454 additions and 1481 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/x86_ops_ret.h
View file

@ -15,7 +15,7 @@
cpu_state.pc = readmemw(ss, SP); \
loadcs(readmemw(ss, SP + 2)); \
} \
if (abrt) return 1; \
if (cpu_state.abrt) return 1; \
if (stack32) ESP += 4 + stack_offset; \
else SP += 4 + stack_offset; \
cycles -= timing_retf_rm;
@ -37,7 +37,7 @@
cpu_state.pc = readmeml(ss, SP); \
loadcs(readmeml(ss, SP + 4) & 0xffff); \
} \
if (abrt) return 1; \
if (cpu_state.abrt) return 1; \
if (stack32) ESP += 8 + stack_offset; \
else SP += 8 + stack_offset; \
cycles -= timing_retf_rm;
@ -107,7 +107,7 @@ static int opIRET_286(uint32_t fetchdat)
flags_extract();
nmi_enable = 1;
CPU_BLOCK_END();
return abrt;
return cpu_state.abrt;
}
static int opIRET(uint32_t fetchdat)
@ -147,7 +147,7 @@ static int opIRET(uint32_t fetchdat)
flags_extract();
nmi_enable = 1;
CPU_BLOCK_END();
return abrt;
return cpu_state.abrt;
}
static int opIRETD(uint32_t fetchdat)
@ -189,6 +189,6 @@ static int opIRETD(uint32_t fetchdat)
flags_extract();
nmi_enable = 1;
CPU_BLOCK_END();
return abrt;
return cpu_state.abrt;
}