mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added PIII Katmai to CPUDB

Browse Source
This commit is contained in:
Stanislav Shwartsman 2011-07-30 14:30:35 +00:00
parent 7a157cf88d
commit fefa4d5e5b
8 changed files with 298 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bochs/config.cc
View File

@ -221,6 +221,9 @@ void bx_init_options()
static const char *cpu_names[] = {
"bochs",
#if BX_SUPPORT_X86_64 == 0
"p3_katmai",
#endif
#if BX_SUPPORT_X86_64
"p4_prescott_celeron_336",
"core2_extreme_x9770",

10
bochs/cpu/Makefile.in
View File

@ -128,7 +128,8 @@ OBJS64 = \
CPUDB_OBJS = cpudb/corei7_sandy_bridge_2600K.o \
cpudb/core2_extreme_x9770.o \
cpudb/p4_prescott_celeron_336.o
cpudb/p4_prescott_celeron_336.o \
cpudb/p3_katmai.o
BX_INCLUDES = ../bochs.h ../config.h
@ -815,3 +816,10 @@ cpudb/p4_prescott_celeron_336.o: cpudb/p4_prescott_celeron_336.@CPP_SUFFIX@ ../b
cpuid.h crregs.h descriptor.h instr.h ia_opcodes.h lazy_flags.h icache.h \
apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h ../fpu/status_w.h \
../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h cpudb/p4_prescott_celeron_336.h
cpudb/p3_katmai.o: cpudb/p3_katmai.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../bxversion.h ../gui/siminterface.h \
../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \
../extplugin.h ../gui/gui.h ../instrument/stubs/instrument.h cpu.h \
cpuid.h crregs.h descriptor.h instr.h ia_opcodes.h lazy_flags.h icache.h \
apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h ../fpu/status_w.h \
../fpu/control_w.h ../cpu/xmm.h vmx.h stack.h cpudb/p3_katmai.h

214
bochs/cpu/cpudb/p3_katmai.cc Executable file
View File

@ -0,0 +1,214 @@
/////////////////////////////////////////////////////////////////////////
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2011 Stanislav Shwartsman
// Written by Stanislav Shwartsman [sshwarts at sourceforge net]
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
//
/////////////////////////////////////////////////////////////////////////
#include "bochs.h"
#include "cpu/cpu.h"
#include "param_names.h"
#include "p3_katmai.h"
#define LOG_THIS cpu->
#if BX_CPU_LEVEL >= 6
#if BX_SUPPORT_X86_64 == 0
p3_katmai_t::p3_katmai_t(BX_CPU_C *cpu): bx_cpuid_t(cpu)
{
if (BX_SUPPORT_X86_64)
BX_PANIC(("x86-64 should be disabled for PIII (Katmai) configuration"));
}
void p3_katmai_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf)
{
switch(function) {
case 0x00000000:
get_std_cpuid_leaf_0(leaf);
return;
case 0x00000001:
get_std_cpuid_leaf_1(leaf);
return;
case 0x00000002:
get_std_cpuid_leaf_2(leaf);
return;
case 0x00000003:
default:
get_std_cpuid_leaf_3(leaf);
return;
}
}
Bit32u p3_katmai_t::get_isa_extensions_bitmask(void) const
{
return BX_CPU_X87 |
BX_CPU_486 |
BX_CPU_PENTIUM |
BX_CPU_P6 |
BX_CPU_MMX |
BX_CPU_FXSAVE_FXRSTOR |
BX_CPU_SYSENTER_SYSEXIT |
BX_CPU_SSE;
}
Bit32u p3_katmai_t::get_cpu_extensions_bitmask(void) const
{
return BX_CPU_DEBUG_EXTENSIONS |
BX_CPU_VME |
BX_CPU_PSE |
BX_CPU_PAE |
BX_CPU_PGE |
BX_CPU_PSE36 |
BX_CPU_PAT_MTRR;
}
// leaf 0x00000000 //
void p3_katmai_t::get_std_cpuid_leaf_0(cpuid_function_t *leaf)
{
static const char* vendor_string = "GenuineIntel";
// EAX: highest std function understood by CPUID
// EBX: vendor ID string
// EDX: vendor ID string
// ECX: vendor ID string
leaf->eax = 0x3;
// CPUID vendor string (e.g. GenuineIntel, AuthenticAMD, CentaurHauls, ...)
memcpy(&(leaf->ebx), vendor_string, 4);
memcpy(&(leaf->edx), vendor_string + 4, 4);
memcpy(&(leaf->ecx), vendor_string + 8, 4);
#ifdef BX_BIG_ENDIAN
leaf->ebx = bx_bswap32(leaf->ebx);
leaf->ecx = bx_bswap32(leaf->ecx);
leaf->edx = bx_bswap32(leaf->edx);
#endif
}
// leaf 0x00000001 //
void p3_katmai_t::get_std_cpuid_leaf_1(cpuid_function_t *leaf)
{
// EAX: CPU Version Information
// [3:0] Stepping ID
// [7:4] Model: starts at 1
// [11:8] Family: 4=486, 5=Pentium, 6=PPro, ...
// [13:12] Type: 0=OEM, 1=overdrive, 2=dual cpu, 3=reserved
// [19:16] Extended Model
// [27:20] Extended Family
leaf->eax = 0x00000673;
leaf->ebx = 0;
leaf->ecx = 0;
// EDX: Standard Feature Flags
// * [0:0] FPU on chip
// * [1:1] VME: Virtual-8086 Mode enhancements
// * [2:2] DE: Debug Extensions (I/O breakpoints)
// * [3:3] PSE: Page Size Extensions
// * [4:4] TSC: Time Stamp Counter
// * [5:5] MSR: RDMSR and WRMSR support
// * [6:6] PAE: Physical Address Extensions
// * [7:7] MCE: Machine Check Exception
// * [8:8] CXS: CMPXCHG8B instruction
// [9:9] APIC: APIC on Chip
// [10:10] Reserved
// * [11:11] SYSENTER/SYSEXIT support
// * [12:12] MTRR: Memory Type Range Reg
// * [13:13] PGE/PTE Global Bit
// * [14:14] MCA: Machine Check Architecture
// * [15:15] CMOV: Cond Mov/Cmp Instructions
// * [16:16] PAT: Page Attribute Table
// * [17:17] PSE-36: Physical Address Extensions
// * [18:18] PSN: Processor Serial Number
// [19:19] CLFLUSH: CLFLUSH Instruction support
// [20:20] Reserved
// [21:21] DS: Debug Store
// [22:22] ACPI: Thermal Monitor and Software Controlled Clock Facilities
// * [23:23] MMX Technology
// * [24:24] FXSR: FXSAVE/FXRSTOR (also indicates CR4.OSFXSR is available)
// * [25:25] SSE: SSE Extensions
// [26:26] SSE2: SSE2 Extensions
// [27:27] Self Snoop
// [28:28] Hyper Threading Technology
// [29:29] TM: Thermal Monitor
// [30:30] Reserved
// [31:31] PBE: Pending Break Enable
leaf->edx = BX_CPUID_STD_X87 |
BX_CPUID_STD_VME |
BX_CPUID_STD_DEBUG_EXTENSIONS |
BX_CPUID_STD_PSE |
BX_CPUID_STD_TSC |
BX_CPUID_STD_MSR |
BX_CPUID_STD_PAE |
BX_CPUID_STD_MCE |
BX_CPUID_STD_CMPXCHG8B |
BX_CPUID_STD_SYSENTER_SYSEXIT |
BX_CPUID_STD_MTRR |
BX_CPUID_STD_GLOBAL_PAGES |
BX_CPUID_STD_MCA |
BX_CPUID_STD_CMOV |
BX_CPUID_STD_PAT |
BX_CPUID_STD_PSE36 |
BX_CPUID_STD_MMX |
BX_CPUID_STD_FXSAVE_FXRSTOR |
BX_CPUID_STD_SSE;
#if BX_SUPPORT_APIC
// if MSR_APICBASE APIC Global Enable bit has been cleared,
// the CPUID feature flag for the APIC is set to 0.
if (cpu->msr.apicbase & 0x800)
leaf->edx |= BX_CPUID_STD_APIC; // APIC on chip
#endif
}
// leaf 0x00000002 //
void p3_katmai_t::get_std_cpuid_leaf_2(cpuid_function_t *leaf)
{
// CPUID function 0x00000002 - Cache and TLB Descriptors
leaf->eax = 0x03020101;
leaf->ebx = 0x00000000;
leaf->ecx = 0x00000000;
leaf->edx = 0x0C040843;
}
// leaf 0x00000003 //
void p3_katmai_t::get_std_cpuid_leaf_3(cpuid_function_t *leaf)
{
// CPUID function 0x00000003 - Processor Serial Number
leaf->eax = 0;
leaf->ebx = 0;
leaf->ecx = 0;
leaf->edx = 0;
}
void p3_katmai_t::dump_cpuid(void)
{
struct cpuid_function_t leaf;
for (unsigned n=0; n<=0x3; n++) {
BX_CPU_THIS_PTR cpuid->get_cpuid_leaf(n, 0x00000000, &leaf);
BX_INFO(("CPUID[0x%08x]: %08x %08x %08x %08x", n, leaf.eax, leaf.ebx, leaf.ecx, leaf.edx));
}
}
bx_cpuid_t *create_p3_katmai_cpuid(BX_CPU_C *cpu) { return new p3_katmai_t(cpu); }
#endif
#endif

53
bochs/cpu/cpudb/p3_katmai.h Executable file
View File

@ -0,0 +1,53 @@
/////////////////////////////////////////////////////////////////////////
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2011 Stanislav Shwartsman
// Written by Stanislav Shwartsman [sshwarts at sourceforge net]
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
//
/////////////////////////////////////////////////////////////////////////
#ifndef BX_GENERIC_CPUID_DEFINITIONS_H
#define BX_GENERIC_CPUID_DEFINITIONS_H
#include "cpu/cpuid.h"
class p3_katmai_t : public bx_cpuid_t {
public:
p3_katmai_t(BX_CPU_C *cpu);
virtual ~p3_katmai_t() {}
// return CPU name
virtual const char *get_name(void) const { return "p3_katmai"; }
virtual Bit32u get_isa_extensions_bitmask(void) const;
virtual Bit32u get_cpu_extensions_bitmask(void) const;
virtual void get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf);
virtual void dump_cpuid(void);
private:
void get_std_cpuid_leaf_0(cpuid_function_t *leaf);
void get_std_cpuid_leaf_1(cpuid_function_t *leaf);
void get_std_cpuid_leaf_2(cpuid_function_t *leaf);
void get_std_cpuid_leaf_3(cpuid_function_t *leaf);
};
extern bx_cpuid_t *create_p3_katmai_cpuid(BX_CPU_C *cpu);
#endif

2
bochs/cpu/cpudb/p4_prescott_celeron_336.cc
View File

@ -39,7 +39,7 @@ p4_prescott_celeron_336_t::p4_prescott_celeron_336_t(BX_CPU_C *cpu): bx_cpuid_t(
#endif
if (! BX_SUPPORT_X86_64)
BX_PANIC(("You must enable x86-64 for \"%s\" configuration"));
BX_PANIC(("You must enable x86-64 for P4 (Prescott) configuration"));
}
void p4_prescott_celeron_336_t::get_cpuid_leaf(Bit32u function, Bit32u subfunction, cpuid_function_t *leaf)

11
bochs/cpu/init.cc
View File

@ -152,6 +152,10 @@ static Bit64s cpu_param_handler(bx_param_c *param, int set, Bit64s val)
#include "generic_cpuid.h"
#if BX_CPU_LEVEL >= 6
#if BX_SUPPORT_X86_64 == 0
extern bx_cpuid_t *create_p3_katmai_cpuid(BX_CPU_C *cpu);
#endif
#if BX_SUPPORT_X86_64
extern bx_cpuid_t *create_p4_prescott_celeron_336_cpuid(BX_CPU_C *cpu);
extern bx_cpuid_t *create_core2_extreme_x9770_cpuid(BX_CPU_C *cpu);
@ -159,6 +163,7 @@ extern bx_cpuid_t *create_core2_extreme_x9770_cpuid(BX_CPU_C *cpu);
extern bx_cpuid_t *create_corei7_sandy_bridge_2600k_cpuid(BX_CPU_C *cpu);
#endif
#endif
#endif
static bx_cpuid_t *cpuid_factory(BX_CPU_C *cpu)
{
@ -166,6 +171,11 @@ static bx_cpuid_t *cpuid_factory(BX_CPU_C *cpu)
switch(cpu_model) {
case BX_CPU_MODEL_BOCHS:
return create_bx_generic_cpuid(cpu);
#if BX_CPU_LEVEL >= 6
#if BX_SUPPORT_X86_64 == 0
case BX_CPU_MODEL_PIII_KATMAI:
return create_p3_katmai_cpuid(cpu);
#endif
#if BX_SUPPORT_X86_64
case BX_CPU_MODEL_P4_PRESCOTT_CELERON_336:
return create_p4_prescott_celeron_336_cpuid(cpu);
@ -175,6 +185,7 @@ static bx_cpuid_t *cpuid_factory(BX_CPU_C *cpu)
case BX_CPU_MODEL_COREi7_SNB_2600K:
return create_corei7_sandy_bridge_2600k_cpuid(cpu);
#endif
#endif
#endif
default:
return 0;

2
bochs/cpu/todo
View File

@ -48,3 +48,5 @@ TODO (know issues in CPU model):
- VMENTER to not-active state not supported yet
[!] SMX, SVM, XOP, AVX2
[!] TODO: Convert CPUDB to plugins and search for them in runtime

5
bochs/gui/siminterface.h
View File

@ -541,12 +541,17 @@ enum {
enum {
BX_CPU_MODEL_BOCHS,
#if BX_CPU_LEVEL >= 6
#if BX_SUPPORT_X86_64 == 0
BX_CPU_MODEL_P3_KATMAI,
#endif
#if BX_SUPPORT_X86_64
BX_CPU_MODEL_P4_PRESCOTT_CELERON_336,
BX_CPU_MODEL_CORE2_EXTREME_X9770,
#if BX_SUPPORT_AVX
BX_CPU_MODEL_COREi7_SNB_2600K,
#endif
#endif
#endif
BX_CPU_MODEL_LAST
};