80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #3270 from 86Box/feature/checkio_optimize

Browse Source 
386_common: Handle IOPB segment limit corner case more like the old code
This commit is contained in:
Miran Grča
2023-04-23 03:59:23 +02:00
committed by GitHub
parent 3c4dd8c90d 4253c7bae7
commit ff59b58297
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/cpu/386_common.c
View File

@@ -1053,13 +1053,13 @@ enter_smm(int in_hlt)
memset(saved_state, 0x00, SMM_SAVE_STATE_MAP_SIZE * sizeof(uint32_t)); memset(saved_state, 0x00, SMM_SAVE_STATE_MAP_SIZE * sizeof(uint32_t));
if (is_cxsmm) /* Cx6x86 */ if (is_cxsmm) /* Cx6x86 */
smram_save_state_cyrix(saved_state, in_hlt); smram_save_state_cyrix(saved_state, in_hlt);
else if (is_pentium || is_am486) /* Am486 / 5x86 / Intel P5 (Pentium) */ else if (is_pentium || is_am486) /* Am486 / 5x86 / Intel P5 (Pentium) */
smram_save_state_p5(saved_state, in_hlt); smram_save_state_p5(saved_state, in_hlt);
else if (is_k5 || is_k6) /* AMD K5 and K6 */ else if (is_k5 || is_k6) /* AMD K5 and K6 */
smram_save_state_amd_k(saved_state, in_hlt); smram_save_state_amd_k(saved_state, in_hlt);
else if (is_p6) /* Intel P6 (Pentium Pro, Pentium II, Celeron) */ else if (is_p6) /* Intel P6 (Pentium Pro, Pentium II, Celeron) */
smram_save_state_p6(saved_state, in_hlt); smram_save_state_p6(saved_state, in_hlt);
cr0 &= ~0x8000000d; cr0 &= ~0x8000000d;
@@ -1224,13 +1224,13 @@ leave_smm(void)
} }
x386_common_log("New SMBASE: %08X (%08X)\n", saved_state[SMRAM_FIELD_P5_SMBASE_OFFSET], saved_state[66]); x386_common_log("New SMBASE: %08X (%08X)\n", saved_state[SMRAM_FIELD_P5_SMBASE_OFFSET], saved_state[66]);
if (is_cxsmm) /* Cx6x86 */ if (is_cxsmm) /* Cx6x86 */
smram_restore_state_cyrix(saved_state); smram_restore_state_cyrix(saved_state);
else if (is_pentium || is_am486) /* Am486 / 5x86 / Intel P5 (Pentium) */ else if (is_pentium || is_am486) /* Am486 / 5x86 / Intel P5 (Pentium) */
smram_restore_state_p5(saved_state); smram_restore_state_p5(saved_state);
else if (is_k5 || is_k6) /* AMD K5 and K6 */ else if (is_k5 || is_k6) /* AMD K5 and K6 */
smram_restore_state_amd_k(saved_state); smram_restore_state_amd_k(saved_state);
else if (is_p6) /* Intel P6 (Pentium Pro, Pentium II, Celeron) */ else if (is_p6) /* Intel P6 (Pentium Pro, Pentium II, Celeron) */
smram_restore_state_p6(saved_state); smram_restore_state_p6(saved_state);
in_smm = 0; in_smm = 0;
@@ -1429,24 +1429,27 @@ x86illegal(void)
int int
checkio(uint32_t port, int mask) checkio(uint32_t port, int mask)
{ {
uint16_t t; uint32_t t;
cpl_override = 1; cpl_override = 1;
t = readmemw(tr.base, 0x66); t = readmemw(tr.base, 0x66);
if (cpu_state.abrt) { if (UNLIKELY(cpu_state.abrt)) {
cpl_override = 0; cpl_override = 0;
return 0; return 0;
} }
if ((t + (port >> 3UL) + 1) > tr.limit) { t += (port >> 3UL);
cpl_override = 0; mask <<= (port & 7);
return mask; if (UNLIKELY(mask & 0xff00)) {
if (LIKELY(t < tr.limit))
mask &= readmemwl(tr.base + t);
} else {
if (LIKELY(t <= tr.limit))
mask &= readmembl(tr.base + t);
} }
t = readmemwl(tr.base + t + (port >> 3));
cpl_override = 0; cpl_override = 0;
return (t >> (port & 7)) & mask; return mask;
} }
#ifdef OLD_DIVEXCP #ifdef OLD_DIVEXCP

8
src/include/86box/86box.h
View File

@@ -55,6 +55,14 @@
#define BCD16(x) ((((x) / 1000) << 12) | (((x) / 100) << 8) | BCD8(x)) #define BCD16(x) ((((x) / 1000) << 12) | (((x) / 100) << 8) | BCD8(x))
#define BCD32(x) ((((x) / 10000000) << 28) | (((x) / 1000000) << 24) | (((x) / 100000) << 20) | (((x) / 10000) << 16) | BCD16(x)) #define BCD32(x) ((((x) / 10000000) << 28) | (((x) / 1000000) << 24) | (((x) / 100000) << 20) | (((x) / 10000) << 16) | BCD16(x))
#if defined(__GNUC__) || defined(__clang__)
# define UNLIKELY(x) __builtin_expect((x), 0)
# define LIKELY(x) __builtin_expect((x), 1)
#else
# define UNLIKELY(x) (x)
# define LIKELY(x) (x)
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif