diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index fa824c1e8..e4dd07dd6 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -114,6 +114,7 @@ int isa_cycles, cpu_inited, cpu_override, cpu_effective, cpu_multi, cpu_16bitbus, cpu_64bitbus, cpu_busspeed, cpu_cyrix_alignment, CPUID, + is186, is_nec, is286, is386, is486 = 1, cpu_isintel, cpu_iscyrix, hascache, isibm486, israpidcad, is_vpc, is_am486, is_am486dxl, is_pentium, is_k5, is_k6, is_p6, is_cxsmm, hasfpu, @@ -373,8 +374,8 @@ cpu_set(void) CPUID = cpu_s->cpuid_model; is8086 = (cpu_s->cpu_type > CPU_8088); - is_nec = (cpu->type == CPU_V20) || (cpu->type == CPU_V30); - is186 = (cpu->type == CPU_186) || (cpu->type == CPU_V30); + is_nec = (cpu_s->cpu_type == CPU_V20) || (cpu_s->cpu_type == CPU_V30); + is186 = (cpu_s->cpu_type == CPU_186) || (cpu_s->cpu_type == CPU_V20) || (cpu_s->cpu_type == CPU_V30); is286 = (cpu_s->cpu_type >= CPU_286); is386 = (cpu_s->cpu_type >= CPU_386SX); israpidcad = (cpu_s->cpu_type == CPU_RAPIDCAD); diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 9b91e3315..1ea146cfd 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -503,7 +503,7 @@ extern double fpu_multi; extern int cpu_cyrix_alignment; /*Cyrix 5x86/6x86 only has data misalignment penalties when crossing 8-byte boundaries*/ -extern int is8086, is186, is286, is386, is486; +extern int is8086, is_nec, is186, is286, is386, is486; extern int is_am486, is_am486dxl, is_pentium, is_k5, is_k6, is_p6, is_cxsmm; extern int hascache; extern int isibm486;