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

24
src/386_ops.h
View file

@ -16,12 +16,12 @@ static inline void PUSH_W(uint16_t val)
{
if (stack32)
{
writememw(ss, ESP - 2, val); if (abrt) return;
writememw(ss, ESP - 2, val); if (cpu_state.abrt) return;
ESP -= 2;
}
else
{
writememw(ss, (SP - 2) & 0xFFFF, val); if (abrt) return;
writememw(ss, (SP - 2) & 0xFFFF, val); if (cpu_state.abrt) return;
SP -= 2;
}
}
@ -30,12 +30,12 @@ static inline void PUSH_L(uint32_t val)
{
if (stack32)
{
writememl(ss, ESP - 4, val); if (abrt) return;
writememl(ss, ESP - 4, val); if (cpu_state.abrt) return;
ESP -= 4;
}
else
{
writememl(ss, (SP - 4) & 0xFFFF, val); if (abrt) return;
writememl(ss, (SP - 4) & 0xFFFF, val); if (cpu_state.abrt) return;
SP -= 4;
}
}
@ -45,12 +45,12 @@ static inline uint16_t POP_W()
uint16_t ret;
if (stack32)
{
ret = readmemw(ss, ESP); if (abrt) return 0;
ret = readmemw(ss, ESP); if (cpu_state.abrt) return 0;
ESP += 2;
}
else
{
ret = readmemw(ss, SP); if (abrt) return 0;
ret = readmemw(ss, SP); if (cpu_state.abrt) return 0;
SP += 2;
}
return ret;
@ -61,12 +61,12 @@ static inline uint32_t POP_L()
uint32_t ret;
if (stack32)
{
ret = readmeml(ss, ESP); if (abrt) return 0;
ret = readmeml(ss, ESP); if (cpu_state.abrt) return 0;
ESP += 4;
}
else
{
ret = readmeml(ss, SP); if (abrt) return 0;
ret = readmeml(ss, SP); if (cpu_state.abrt) return 0;
SP += 4;
}
return ret;
@ -77,12 +77,12 @@ static inline uint16_t POP_W_seg(uint32_t seg)
uint16_t ret;
if (stack32)
{
ret = readmemw(seg, ESP); if (abrt) return 0;
ret = readmemw(seg, ESP); if (cpu_state.abrt) return 0;
ESP += 2;
}
else
{
ret = readmemw(seg, SP); if (abrt) return 0;
ret = readmemw(seg, SP); if (cpu_state.abrt) return 0;
SP += 2;
}
return ret;
@ -93,12 +93,12 @@ static inline uint32_t POP_L_seg(uint32_t seg)
uint32_t ret;
if (stack32)
{
ret = readmeml(seg, ESP); if (abrt) return 0;
ret = readmeml(seg, ESP); if (cpu_state.abrt) return 0;
ESP += 4;
}
else
{
ret = readmeml(seg, SP); if (abrt) return 0;
ret = readmeml(seg, SP); if (cpu_state.abrt) return 0;
SP += 4;
}
return ret;