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

Merge remote-tracking branch 'origin/master' into version/4.1

Browse Source
This commit is contained in:
OBattler
2023-08-08 21:05:09 +02:00
parent fd4c606ddb 06998e4278
commit b1a522c432
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cpu/386_common.h
View File

@@ -451,41 +451,41 @@ getquad(void)
} }
#ifdef OPS_286_386 #ifdef OPS_286_386
static __inline uint8_t geteab() static __inline uint8_t geteab(void)
{ {
if (cpu_mod == 3) if (cpu_mod == 3)
return (cpu_rm & 4) ? cpu_state.regs[cpu_rm & 3].b.h : cpu_state.regs[cpu_rm&3].b.l; return (cpu_rm & 4) ? cpu_state.regs[cpu_rm & 3].b.h : cpu_state.regs[cpu_rm&3].b.l;
return readmemb(easeg, cpu_state.eaaddr); return readmemb(easeg, cpu_state.eaaddr);
} }
static __inline uint16_t geteaw() static __inline uint16_t geteaw(void)
{ {
if (cpu_mod == 3) if (cpu_mod == 3)
return cpu_state.regs[cpu_rm].w; return cpu_state.regs[cpu_rm].w;
return readmemw(easeg, cpu_state.eaaddr); return readmemw(easeg, cpu_state.eaaddr);
} }
static __inline uint32_t geteal() static __inline uint32_t geteal(void)
{ {
if (cpu_mod == 3) if (cpu_mod == 3)
return cpu_state.regs[cpu_rm].l; return cpu_state.regs[cpu_rm].l;
return readmeml(easeg, cpu_state.eaaddr); return readmeml(easeg, cpu_state.eaaddr);
} }
static __inline uint64_t geteaq() static __inline uint64_t geteaq(void)
{ {
return readmemq(easeg, cpu_state.eaaddr); return readmemq(easeg, cpu_state.eaaddr);
} }
static __inline uint8_t geteab_mem() static __inline uint8_t geteab_mem(void)
{ {
return readmemb(easeg,cpu_state.eaaddr); return readmemb(easeg,cpu_state.eaaddr);
} }
static __inline uint16_t geteaw_mem() static __inline uint16_t geteaw_mem(void)
{ {
return readmemw(easeg,cpu_state.eaaddr); return readmemw(easeg,cpu_state.eaaddr);
} }
static __inline uint32_t geteal_mem() static __inline uint32_t geteal_mem(void)
{ {
return readmeml(easeg,cpu_state.eaaddr); return readmeml(easeg,cpu_state.eaaddr);
} }

3
src/cpu/cpu.c
View File

@@ -754,7 +754,7 @@ cpu_set(void)
#else #else
x86_setopcodes(ops_186, ops_186_0f); x86_setopcodes(ops_186, ops_186_0f);
#endif #endif
x86_setopcodes_2386(ops_2386_286, ops_2386_286_0f); x86_setopcodes_2386(ops_2386_186, ops_2386_186_0f);
break; break;
case CPU_286: case CPU_286:
@@ -763,6 +763,7 @@ cpu_set(void)
#else #else
x86_setopcodes(ops_286, ops_286_0f); x86_setopcodes(ops_286, ops_286_0f);
#endif #endif
x86_setopcodes_2386(ops_2386_286, ops_2386_286_0f);
if (fpu_type == FPU_287) { if (fpu_type == FPU_287) {
#ifdef USE_DYNAREC #ifdef USE_DYNAREC

2
src/cpu/x86_ops_mov.h
View File

@@ -769,6 +769,7 @@ opMOV_r_l_a32(uint32_t fetchdat)
return 0; return 0;
} }
#ifndef OPS_286_386
#define opCMOV(condition) \ #define opCMOV(condition) \
static int opCMOV##condition##_w_a16(uint32_t fetchdat) \ static int opCMOV##condition##_w_a16(uint32_t fetchdat) \
{ \ { \
@@ -865,3 +866,4 @@ opCMOV(NL)
opCMOV(LE) opCMOV(LE)
opCMOV(NLE) opCMOV(NLE)
// clang-format on // clang-format on
#endif