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

Moved the Intel i686 CPU's and related machines out of the Dev branch.

Browse Source
This commit is contained in:
OBattler
2020-04-10 20:01:26 +02:00
parent d460927c7b
commit d75e901a83
20 changed files with 93 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu_common/cpu.h
View File

@@ -73,11 +73,9 @@ enum {
CPU_K6_2P,
CPU_K6_3P,
CPU_CYRIX3S,
#if defined(DEV_BRANCH) && defined(USE_I686)
CPU_PENTIUMPRO, /* 686 class CPUs */
CPU_PENTIUM2,
CPU_PENTIUM2D,
#endif
CPU_MAX /* Only really needed to close the enum in a way independent of the #ifdef's. */
};
@@ -145,12 +143,10 @@ extern CPU cpus_6x86[];
extern CPU cpus_6x86SS7[];
#endif
#endif
extern CPU cpus_Cyrix3[];
#if defined(DEV_BRANCH) && defined(USE_I686)
extern CPU cpus_Cyrix3[];
extern CPU cpus_PentiumPro[];
extern CPU cpus_PentiumII[];
extern CPU cpus_Celeron[];
#endif
#define C_FLAG 0x0001