Rewritten 808x CPU emulation core based on reenigne's XTCE, VisiOn, SnatchIt, and 8088 MPH now work correctly;
Fixed PC speaker sound volume in PIT mode 0; A few CPU emulation clean-ups; Hard disk controller changing redone in a less messy way; Re-added the long-missing key send delay handling to the XT keyboard handler; Fixed a bug that was causing SLiRP not to work when compiled with MingW/GCC 7.3.0-2 or newer; Some serial mouse and port fixes; A lot of changes to printer emulation, mostly based on DOSBox-X; Printer PNG writer now uses statically linked libpng; Added support for the HxC MFM floppy image format and upped 86F format version to 2.12; Ported various things from PCem and some from VARCem; Added the S3 86c801/805 emulation (patch from TheCollector1995); Fixed and renamed the EGA monitor options; Better synchronized the 808x to the PIT and the CGA; Fixed the CGA wait state calculation; Cleaned up some things in mem.c; Fixed some things in the floppy emulation to make VisiOn get the correct errors from the copy protection disk; Fixed several renderer-related bugs, including the SDL2 renderer's failure to take screenshots; The Jenkins builds are now compiled with MingW/GCC 7.4.0-1 and include all the required DLL's.
This commit is contained in:
102
src/cpu/x86.h
102
src/cpu/x86.h
@@ -1,23 +1,28 @@
|
||||
uint16_t oldcs;
|
||||
extern uint32_t rmdat32;
|
||||
int oldcpl;
|
||||
extern uint8_t opcode, opcode2;
|
||||
extern uint8_t flags_p;
|
||||
extern uint8_t znptable8[256];
|
||||
|
||||
extern int nmi_enable;
|
||||
extern uint16_t zero, oldcs;
|
||||
extern uint16_t lastcs, lastpc;
|
||||
extern uint16_t rds, ea_rseg;
|
||||
extern uint16_t znptable16[65536];
|
||||
extern uint16_t *mod1add[2][8];
|
||||
|
||||
int tempc;
|
||||
int output;
|
||||
int firstrepcycle;
|
||||
extern int x86_was_reset, codegen_flat_ds;
|
||||
extern int codegen_flat_ss, nmi_enable;
|
||||
extern int timetolive, keyboardtimer, trap;
|
||||
extern int tempc, optype, use32, stack32;
|
||||
extern int oldcpl, cgate32, cpl_override, fpucount;
|
||||
extern int gpf, nmi_enable;
|
||||
extern int oddeven, inttype;
|
||||
|
||||
uint32_t easeg,ealimit,ealimitw;
|
||||
extern uint32_t rmdat32, easeg;
|
||||
extern uint32_t oxpc, flags_zn;
|
||||
extern uint32_t abrt_error;
|
||||
extern uint32_t backupregs[16];
|
||||
extern uint32_t *mod1seg[8];
|
||||
extern uint32_t *eal_r, *eal_w;
|
||||
|
||||
int skipnextprint;
|
||||
int inhlt;
|
||||
|
||||
uint8_t opcode;
|
||||
int noint;
|
||||
|
||||
uint16_t lastcs,lastpc;
|
||||
extern int timetolive,keyboardtimer;
|
||||
|
||||
#define setznp168 setznp16
|
||||
|
||||
@@ -30,47 +35,25 @@ extern int timetolive,keyboardtimer;
|
||||
#define setr16(r,v) cpu_state.regs[r].w=v
|
||||
#define setr32(r,v) cpu_state.regs[r].l=v
|
||||
|
||||
uint8_t znptable8[256];
|
||||
uint16_t znptable16[65536];
|
||||
#define fetchea() { \
|
||||
rmdat = readmemb(cs + pc); \
|
||||
pc++; \
|
||||
reg = (rmdat >> 3) & 7; \
|
||||
mod = (rmdat >> 6) & 3; \
|
||||
rm = rmdat & 7; \
|
||||
if (mod!=3) \
|
||||
fetcheal(); \
|
||||
}
|
||||
|
||||
int use32;
|
||||
int stack32;
|
||||
|
||||
#define fetchea() { rmdat=readmemb(cs+pc); pc++; \
|
||||
reg=(rmdat>>3)&7; \
|
||||
mod=(rmdat>>6)&3; \
|
||||
rm=rmdat&7; \
|
||||
if (mod!=3) fetcheal(); }
|
||||
|
||||
|
||||
int optype;
|
||||
#define JMP 1
|
||||
#define CALL 2
|
||||
#define IRET 3
|
||||
#define OPTYPE_INT 4
|
||||
|
||||
uint32_t oxpc;
|
||||
|
||||
extern uint16_t *mod1add[2][8];
|
||||
extern uint32_t *mod1seg[8];
|
||||
|
||||
|
||||
#define IRQTEST ((flags&I_FLAG) && (pic.pend&~pic.mask) && !noint)
|
||||
|
||||
extern int cgate32;
|
||||
|
||||
|
||||
extern uint32_t *eal_r, *eal_w;
|
||||
|
||||
|
||||
extern uint32_t flags_zn;
|
||||
extern uint8_t flags_p;
|
||||
#define FLAG_N (flags_zn>>31)
|
||||
#define FLAG_Z (flags_zn)
|
||||
#define FLAG_P (znptable8[flags_p]&P_FLAG)
|
||||
|
||||
extern int gpf;
|
||||
|
||||
|
||||
enum
|
||||
{
|
||||
@@ -83,25 +66,8 @@ enum
|
||||
ABRT_PF = 0xE
|
||||
};
|
||||
|
||||
extern uint32_t abrt_error;
|
||||
|
||||
void x86_doabrt(int x86_abrt);
|
||||
|
||||
extern uint8_t opcode2;
|
||||
|
||||
extern uint16_t rds;
|
||||
extern uint32_t rmdat32;
|
||||
|
||||
extern int inscounts[256];
|
||||
|
||||
void x86illegal();
|
||||
|
||||
void x86seg_reset();
|
||||
void x86gpf(char *s, uint16_t error);
|
||||
|
||||
extern uint16_t zero;
|
||||
|
||||
extern int x86_was_reset;
|
||||
|
||||
extern int codegen_flat_ds;
|
||||
extern int codegen_flat_ss;
|
||||
extern void x86_doabrt(int x86_abrt);
|
||||
extern void x86illegal();
|
||||
extern void x86seg_reset();
|
||||
extern void x86gpf(char *s, uint16_t error);
|
||||
|
||||
Reference in New Issue
Block a user