mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-25 04:45:31 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'upstream/master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-10-27 04:08:26 -04:00
parent 3a512879ee bff5026b8b
commit f99a0e7ff1
6 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpu/cpu.c
View File

@@ -73,6 +73,9 @@ enum {
/* Make sure this is as low as possible. */
cpu_state_t cpu_state;
/* Place this immediately after. */
uint32_t abrt_error;
#ifdef USE_DYNAREC
const OpFn *x86_dynarec_opcodes, *x86_dynarec_opcodes_0f,
*x86_dynarec_opcodes_d8_a16, *x86_dynarec_opcodes_d8_a32,

2
src/cpu/x86seg.c
View File

@@ -41,8 +41,6 @@ uint8_t opcode2;
int cgate16, cgate32;
int intgatesize;
uint32_t abrt_error;
void taskswitch286(uint16_t seg, uint16_t *segdat, int is32);
void pmodeint(int num, int soft);