claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for the D86F floppy image format I invented that allows things not possible with IMG images;

Browse Source 
Applied all mainline PCem commits;
Settings dialog now says 86Box instead of PCem;
Manifest renamed from PCem to 86Box.
This commit is contained in:
OBattler
2016-08-31 22:49:56 +02:00
parent d860ea79ed
commit 1ddad56c8c
81 changed files with 4255 additions and 3899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/x86_ops_ret.h
View File

@@ -1,6 +1,3 @@
/* Copyright holders: Sarah Walker
see COPYING for more details
*/
#define RETF_a16(stack_offset) \
if ((msw&1) && !(eflags&VM_FLAG)) \
{ \
@@ -18,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;
@@ -40,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;
@@ -110,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)
@@ -150,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)
@@ -192,6 +189,6 @@ static int opIRETD(uint32_t fetchdat)
flags_extract();
nmi_enable = 1;
CPU_BLOCK_END();
return abrt;
return cpu_state.abrt;
}