Skip to content

Commit 78f50c5

Browse files
OBattlerOBattler
committed
Move the Cyrix 6x86 out of the Dev branch.
1 parent 9b47522 commit 78f50c5

File tree

7 files changed

+1
-32
lines changed

7 files changed

+1
-32
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ endif()
163163
cmake_dependent_option(AMD_K5 "AMD K5" ON "DEV_BRANCH" OFF)
164164
cmake_dependent_option(AN430TX "Intel AN430TX" ON "DEV_BRANCH" OFF)
165165
cmake_dependent_option(CDROM_MITSUMI "Mitsumi CDROM" ON "DEV_BRANCH" OFF)
166-
cmake_dependent_option(CYRIX_6X86 "Cyrix 6x86" ON "DEV_BRANCH" OFF)
167166
cmake_dependent_option(G100 "Matrox Productiva G100" ON "DEV_BRANCH" OFF)
168167
cmake_dependent_option(GUSMAX "Gravis UltraSound MAX" ON "DEV_BRANCH" OFF)
169168
cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage" ON "DEV_BRANCH" OFF)

‎src/cpu/386_ops.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,6 @@ const OpFn OP_TABLE(pentium_0f)[1024] = {
13851385
// clang-format on
13861386
};
13871387

1388-
# ifdef USE_CYRIX_6X86
13891388
const OpFn OP_TABLE(c6x86_0f)[1024] = {
13901389
// clang-format off
13911390
/*16-bit data, 16-bit addr*/
@@ -1569,7 +1568,6 @@ const OpFn OP_TABLE(c6x86l_0f)[1024] = {
15691568
/*f0*/ ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL, ILLEGAL,
15701569
// clang-format on
15711570
};
1572-
# endif /* USE_CYRIX_6X86 */
15731571

15741572
const OpFn OP_TABLE(pentiummmx_0f)[1024] = {
15751573
// clang-format off
@@ -1847,7 +1845,6 @@ const OpFn OP_TABLE(k62_0f)[1024] = {
18471845
// clang-format on
18481846
};
18491847

1850-
# ifdef USE_CYRIX_6X86
18511848
const OpFn OP_TABLE(c6x86mx_0f)[1024] = {
18521849
// clang-format off
18531850
/*16-bit data, 16-bit addr*/
@@ -1939,7 +1936,6 @@ const OpFn OP_TABLE(c6x86mx_0f)[1024] = {
19391936
/*f0*/ ILLEGAL, opPSLLW_a32, opPSLLD_a32, opPSLLQ_a32, ILLEGAL, opPMADDWD_a32, ILLEGAL, ILLEGAL, opPSUBB_a32, opPSUBW_a32, opPSUBD_a32, ILLEGAL, opPADDB_a32, opPADDW_a32, opPADDD_a32, ILLEGAL,
19401937
// clang-format on
19411938
};
1942-
# endif /* USE_CYRIX_6X86 */
19431939

19441940
const OpFn OP_TABLE(pentiumpro_0f)[1024] = {
19451941
// clang-format off

‎src/cpu/CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,12 @@ endif()
4242

4343
endif()
4444

45-
if(CYRIX_6X86)
46-
target_compile_definitions(cpu PRIVATE USE_CYRIX_6X86)
47-
48-
if(DYNAREC)
49-
add_library(ct686 OBJECT codegen_timing_686.c)
50-
target_link_libraries(86Box ct686)
51-
endif()
52-
endif()
53-
5445
if(DYNAREC)
5546
target_sources(cpu PRIVATE 386_dynarec_ops.c)
5647

5748
add_library(cgt OBJECT
5849
codegen_timing_486.c
50+
codegen_timing_686.c
5951
codegen_timing_common.c
6052
codegen_timing_k6.c
6153
codegen_timing_pentium.c

‎src/cpu/cpu.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,6 @@ cpu_set(void)
14201420
#endif /* USE_DYNAREC */
14211421
break;
14221422

1423-
#ifdef USE_CYRIX_6X86
14241423
case CPU_Cx6x86:
14251424
case CPU_Cx6x86L:
14261425
case CPU_CxGX1:
@@ -1541,7 +1540,6 @@ cpu_set(void)
15411540
else if (CPU_Cx6x86)
15421541
CPUID = 0; /* Disabled on powerup by default */
15431542
break;
1544-
#endif /* USE_CYRIX_6X86 */
15451543

15461544
#ifdef USE_AMD_K5
15471545
case CPU_K5:
@@ -2386,7 +2384,6 @@ cpu_CPUID(void)
23862384
EAX = EBX = ECX = EDX = 0;
23872385
break;
23882386

2389-
#ifdef USE_CYRIX_6X86
23902387
case CPU_Cx6x86:
23912388
if (!EAX) {
23922389
EAX = 0x00000001;
@@ -2447,7 +2444,6 @@ cpu_CPUID(void)
24472444
} else
24482445
EAX = EBX = ECX = EDX = 0;
24492446
break;
2450-
#endif /* USE_CYRIX_6X86 */
24512447

24522448
case CPU_PENTIUMPRO:
24532449
if (!EAX) {
@@ -3124,7 +3120,6 @@ cpu_RDMSR(void)
31243120
cpu_log("RDMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
31253121
break;
31263122

3127-
#ifdef USE_CYRIX_6X86
31283123
case CPU_Cx6x86:
31293124
case CPU_Cx6x86L:
31303125
case CPU_CxGX1:
@@ -3164,7 +3159,6 @@ cpu_RDMSR(void)
31643159
}
31653160
cpu_log("RDMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
31663161
break;
3167-
#endif /* USE_CYRIX_6X86 */
31683162

31693163
case CPU_PENTIUMPRO:
31703164
case CPU_PENTIUM2:
@@ -3945,7 +3939,6 @@ cpu_WRMSR(void)
39453939
}
39463940
break;
39473941

3948-
#ifdef USE_CYRIX_6X86
39493942
case CPU_Cx6x86:
39503943
case CPU_Cx6x86L:
39513944
case CPU_CxGX1:
@@ -3979,7 +3972,6 @@ cpu_WRMSR(void)
39793972
break;
39803973
}
39813974
break;
3982-
#endif /* USE_CYRIX_6X86 */
39833975

39843976
case CPU_PENTIUMPRO:
39853977
case CPU_PENTIUM2:
@@ -4283,14 +4275,12 @@ cpu_write(uint16_t addr, uint8_t val, UNUSED(void *priv))
42834275
case 0xe8: /* CCR4 */
42844276
if ((ccr3 & 0xf0) == 0x10) {
42854277
ccr4 = val;
4286-
#ifdef USE_CYRIX_6X86
42874278
if (cpu_s->cpu_type >= CPU_Cx6x86) {
42884279
if (val & 0x80)
42894280
CPUID = cpu_s->cpuid_model;
42904281
else
42914282
CPUID = 0;
42924283
}
4293-
#endif /* USE_CYRIX_6X86 */
42944284
}
42954285
break;
42964286
case 0xe9: /* CCR5 */

‎src/cpu/cpu_table.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6095,7 +6095,6 @@ const cpu_family_t cpu_families[] = {
60956095
{ .name = "", 0 }
60966096
}
60976097
},
6098-
#ifdef USE_CYRIX_6X86
60996098
{
61006099
.package = CPU_PKG_SOCKET5_7,
61016100
.manufacturer = "Cyrix",
@@ -6455,7 +6454,6 @@ const cpu_family_t cpu_families[] = {
64556454
{ .name = "", 0 }
64566455
}
64576456
},
6458-
#endif /* USE_CYRIX_6X86 */
64596457
{
64606458
.package = CPU_PKG_SOCKET8,
64616459
.manufacturer = "Intel",

‎src/cpu/x86_ops.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,9 @@ extern const OpFn dynarec_ops_winchip2_0f[1024];
9090
extern const OpFn dynarec_ops_pentium_0f[1024];
9191
extern const OpFn dynarec_ops_pentiummmx_0f[1024];
9292

93-
# ifdef USE_CYRIX_6X86
9493
extern const OpFn dynarec_ops_c6x86_0f[1024];
9594
extern const OpFn dynarec_ops_c6x86l_0f[1024];
9695
extern const OpFn dynarec_ops_c6x86mx_0f[1024];
97-
# endif /* USE_CYRIX_6X86 */
9896

9997
extern const OpFn dynarec_ops_k6_0f[1024];
10098
extern const OpFn dynarec_ops_k62_0f[1024];
@@ -233,11 +231,9 @@ extern const OpFn ops_winchip2_0f[1024];
233231
extern const OpFn ops_pentium_0f[1024];
234232
extern const OpFn ops_pentiummmx_0f[1024];
235233

236-
#ifdef USE_CYRIX_6X86
237234
extern const OpFn ops_c6x86_0f[1024];
238235
extern const OpFn ops_c6x86l_0f[1024];
239236
extern const OpFn ops_c6x86mx_0f[1024];
240-
#endif /* USE_CYRIX_6X86 */
241237

242238
extern const OpFn ops_k6_0f[1024];
243239
extern const OpFn ops_k62_0f[1024];

‎src/cpu/x86_ops_mmx_mov.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ opMOVD_mm_l_a32(uint32_t fetchdat)
110110
return 0;
111111
}
112112

113-
#ifdef USE_CYRIX_6X86
114113
/*Cyrix maps both MOVD and SMINT to the same opcode*/
115114
static int
116115
opMOVD_mm_l_a16_cx(uint32_t fetchdat)
@@ -170,7 +169,6 @@ opMOVD_mm_l_a32_cx(uint32_t fetchdat)
170169

171170
return 0;
172171
}
173-
#endif /* USE_CYRIX_6X86 */
174172

175173
static int
176174
opMOVQ_q_mm_a16(uint32_t fetchdat)

0 commit comments

Comments
 (0)