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

Split off the AMD SYSCALL and SYSRET instructions to x86_ops_amd.h;

Browse Source 
Moved the two 440FX board along with the Pentium Pro and Pentium II CPU's to the Dev branch;
Applied the PCem commit that fixed PIIX IDE Bus Master initialization.
This commit is contained in:
OBattler
2018-01-01 02:57:39 +01:00
parent a8be9c22e9
commit 23c536f5dd
12 changed files with 336 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cpu/cpu.h
View File

@@ -8,15 +8,15 @@
*
* CPU type handler.
*
* Version: @(#)cpu.h 1.0.4 2017/11/27
* Version: @(#)cpu.h 1.0.5 2018/01/01
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* leilei,
* Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016-2017 leilei.
* Copyright 2016,2017 Miran Grca.
* Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2018 leilei.
* Copyright 2016,2018 Miran Grca.
*/
#ifndef EMU_CPU_H
# define EMU_CPU_H
@@ -48,6 +48,8 @@
#define CPU_K5 23
#define CPU_5K86 24
#define CPU_K6 25
#ifdef DEV_BRANCH
#ifdef USE_I686
#define CPU_PENTIUMPRO 26 /* 686 class CPUs */
#if 0
# define CPU_PENTIUM2 27
@@ -55,6 +57,8 @@
#else
# define CPU_PENTIUM2D 27
#endif
#endif
#endif
#define MANU_INTEL 0
#define MANU_AMD 1
@@ -100,9 +104,13 @@ extern CPU cpus_K5[];
extern CPU cpus_K56[];
extern CPU cpus_Pentium[];
extern CPU cpus_6x86[];
#ifdef DEV_BRANCH
#ifdef USE_I686
extern CPU cpus_PentiumPro[];
extern CPU cpus_Pentium2[];
extern CPU cpus_Pentium2D[];
#endif
#endif
#define C_FLAG 0x0001