dos2unix fixes

This commit is contained in:
Stanislav Shwartsman 2003-09-26 16:07:38 +00:00
parent 789db2603e
commit 15e84d0f5d

View File

@ -1,315 +1,315 @@
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
//
// MandrakeSoft S.A.
// 43, rue d'Aboukir
// 75002 Paris - France
// http://www.linux-mandrake.com/
// http://www.mandrakesoft.com/
//
// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#define LOG_THIS BX_CPU_THIS_PTR
#if BX_SUPPORT_X86_64==0
// Make life easier for merging code.
#define RAX EAX
#define RBX EBX
#define RCX ECX
#define RDX EDX
#endif
/* Get CPU version information. */
static Bit32u get_cpu_version_information()
{
Bit32u family = 0, model = 0, stepping = 0;
Bit32u extended_model = 0;
Bit32u extended_family = 0;
/* ****** */
/* i486 */
/* ****** */
#if BX_CPU_LEVEL == 4
family = 4;
#if BX_SUPPORT_FPU
model = 1; // 486dx
stepping = 3;
#else
model = 2; // 486sx
stepping = 3;
#endif
/* **************** */
/* i586 (Pentium) */
/* **************** */
#elif BX_CPU_LEVEL == 5
family = 5;
model = 1; // Pentium (60,66)
stepping = 3;
/* ****** */
/* i686 */
/* ****** */
#elif BX_CPU_LEVEL == 6
#if BX_SUPPORT_SSE >= 2 // Pentium 4 processor
/*
The model, family, and processor type for the first
processor in the Intel Pentium 4 family is as follows:
* Model-0000B
* Family-1111B
* Processor Type-00B (OEM)
*/
model = 0;
family = 0x0F;
stepping = 3;
#if BX_SUPPORT_X86_64
model = 2; // Hammer returns what?
#endif
#else // Pentium Pro/Pentium II/Pentium III processor
family = 6;
model = 8;
stepping = 3;
#endif
#else
BX_PANIC(("CPUID family ID not implemented for CPU LEVEL > 6"));
#endif
return (extended_family << 20) |
(extended_model << 16) |
(family << 8) |
(model<<4) | stepping;
}
/* Get CPU extended feature flags. */
static Bit32u get_extended_cpuid_features()
{
Bit32u features = 0; // start with none
#if BX_SUPPORT_PNI
features |= 0x01; // report PNI
#endif
return features;
}
/* Get CPU feature flags. Returned by CPUID functions 1 and 80000001. */
static Bit32u get_std_cpuid_features()
{
Bit32u features = 0; // start with none
// EAX: CPU Version Infromation
// [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
// [31:14] Reserved
// EBX:
// [7:0] Brand ID
// [15:8] CFLUSH cache line size (value*8 = cache line size in bytes)
// [23:16] Number of logical processors in one physical processor
// [31:24] Local Apic ID
// ECX: Feature Flags::Extended
// [0:0] PNI
// [3:3] MONITOR/MWAIT
// [7:7] Enchanced Intel Speedstep Technology
// EDX: 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
// [22:16] Reserved
// [23:23] MMX Technology
// [24] FXSR: FSAVE/FXRSTOR (also indicates CR4.OSFXSR is available)
// [25] SSE: SSE Extensions
// [26] SSE2: SSE2 Extensions
// [28] Reserved
// [29] TM: Therm Monitor
// [31:30] Reserved
#if BX_SUPPORT_FPU
features |= 0x01;
#endif
#if (BX_CPU_LEVEL >= 5)
features |= (1<< 8); // Support CMPXCHG8B instruction
features |= (1<< 4); // implement TSC
features |= (1<< 5); // support RDMSR/WRMSR
#if BX_SUPPORT_MMX
features |= (1<<23); // support MMX
#endif
#endif
#if BX_CPU_LEVEL == 6
features |= (1<<15); // Implement CMOV instructions.
#if BX_SUPPORT_APIC
features |= (1<< 9); // APIC on chip
#endif
#if BX_SUPPORT_SSE >= 1
features |= (1<<24); // support FSAVE/FXRSTOR
features |= (1<<25); // support SSE
#endif
#if BX_SUPPORT_SSE >= 2
features |= (1<<26); // support SSE2
#endif
#endif
#if BX_SUPPORT_4MEG_PAGES
features |= (1<< 3); // Support Page-Size Extension (4M pages)
#endif
#if BX_SupportGlobalPages
features |= (1<<13); // Support Global pages.
#endif
#if BX_SupportPAE
features |= (1<< 6); // Support PAE.
#endif
#if BX_SUPPORT_SEP
features |= (1<<11); // SYSENTER/SYSEXIT
#endif
return features;
}
void BX_CPU_C::CPUID(bxInstruction_c *i)
{
#if BX_SUPPORT_X86_64
unsigned features;
#endif
invalidate_prefetch_q();
#if BX_CPU_LEVEL >= 4
switch (EAX) {
case 0:
// EAX: highest input value understood by CPUID
#if BX_CPU_LEVEL <= 6
RAX = 1; // 486 and Pentium processors
#else
RAX = 1; // for Pentium Pro, Pentium II, Pentium 4 processors
// should be 2, still not implemented
#endif
// EBX: vendor ID string
// EDX: vendor ID string
// ECX: vendor ID string
#if BX_SUPPORT_X86_64
RBX = 0x68747541; // "Auth"
RDX = 0x69746e65; // "enti"
RCX = 0x444d4163; // "cAMD"
#else
RBX = 0x756e6547; // "Genu"
RDX = 0x49656e69; // "ineI"
RCX = 0x6c65746e; // "ntel"
#endif
break;
case 1:
RAX = get_cpu_version_information();
RBX = 0; // still not implemented
RCX = get_extended_cpuid_features ();
RDX = get_std_cpuid_features ();
break;
#if 0
#if BX_CPU_LEVEL >= 6
case 2:
RAX = 0; // cache and TLB information (still not implemented)
RBX = 0; // cache and TLB information (still not implemented)
RCX = 0; // cache and TLB information (still not implemented)
RDX = 0; // cache and TLB information (still not implemented)
#endif
#endif
// Here should be extended information for Pentum 4 processor
// still not implemented ...
#if BX_SUPPORT_X86_64
// x86-64 functions
case 0x80000000:
// max function supported.
RAX = 0x80000008;
RBX = 0x68747541; // "Auth"
RDX = 0x69746e65; // "enti"
RCX = 0x444d4163; // "cAMD"
break;
case 0x80000001:
// long mode supported.
features = get_std_cpuid_features ();
RAX = features;
// Many of the bits in EDX are the same as EAX
// [10:10] Reserved
// [11:11] SYSCALL and SYSRET instructions
// [18:19] Reserved
// [20:20] No-Execute page protection
// [21:21] Reserved
// [22:22] AMD MMX Extensions
// [25:28] Reserved
// [29:29] Long Mode
// [30:30] AMD 3DNow Extensions
// [31:31] AMD 3DNow Intructions
features = features & 0x0183F3FF;
RDX = features | (1 << 29) | (1 << 11);
RBX = 0;
RCX = 0;
RDX = 0; // Reserved, undefined
break;
case 0x80000008:
// virtual & phys address size in low 2 bytes.
RAX = 0x00003028;
RBX = 0;
RCX = 0;
RDX = 0; // Reserved, undefined
break;
#endif // #if BX_SUPPORT_X86_64
default:
RAX = 0;
RBX = 0;
RCX = 0;
RDX = 0; // Reserved, undefined
break;
}
#else
BX_PANIC(("CPUID: not available on < late 486"));
#endif
}
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
//
// MandrakeSoft S.A.
// 43, rue d'Aboukir
// 75002 Paris - France
// http://www.linux-mandrake.com/
// http://www.mandrakesoft.com/
//
// 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#define LOG_THIS BX_CPU_THIS_PTR
#if BX_SUPPORT_X86_64==0
// Make life easier for merging code.
#define RAX EAX
#define RBX EBX
#define RCX ECX
#define RDX EDX
#endif
/* Get CPU version information. */
static Bit32u get_cpu_version_information()
{
Bit32u family = 0, model = 0, stepping = 0;
Bit32u extended_model = 0;
Bit32u extended_family = 0;
/* ****** */
/* i486 */
/* ****** */
#if BX_CPU_LEVEL == 4
family = 4;
#if BX_SUPPORT_FPU
model = 1; // 486dx
stepping = 3;
#else
model = 2; // 486sx
stepping = 3;
#endif
/* **************** */
/* i586 (Pentium) */
/* **************** */
#elif BX_CPU_LEVEL == 5
family = 5;
model = 1; // Pentium (60,66)
stepping = 3;
/* ****** */
/* i686 */
/* ****** */
#elif BX_CPU_LEVEL == 6
#if BX_SUPPORT_SSE >= 2 // Pentium 4 processor
/*
The model, family, and processor type for the first
processor in the Intel Pentium 4 family is as follows:
* Model-0000B
* Family-1111B
* Processor Type-00B (OEM)
*/
model = 0;
family = 0x0F;
stepping = 3;
#if BX_SUPPORT_X86_64
model = 2; // Hammer returns what?
#endif
#else // Pentium Pro/Pentium II/Pentium III processor
family = 6;
model = 8;
stepping = 3;
#endif
#else
BX_PANIC(("CPUID family ID not implemented for CPU LEVEL > 6"));
#endif
return (extended_family << 20) |
(extended_model << 16) |
(family << 8) |
(model<<4) | stepping;
}
/* Get CPU extended feature flags. */
static Bit32u get_extended_cpuid_features()
{
Bit32u features = 0; // start with none
#if BX_SUPPORT_PNI
features |= 0x01; // report PNI
#endif
return features;
}
/* Get CPU feature flags. Returned by CPUID functions 1 and 80000001. */
static Bit32u get_std_cpuid_features()
{
Bit32u features = 0; // start with none
// EAX: CPU Version Infromation
// [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
// [31:14] Reserved
// EBX:
// [7:0] Brand ID
// [15:8] CFLUSH cache line size (value*8 = cache line size in bytes)
// [23:16] Number of logical processors in one physical processor
// [31:24] Local Apic ID
// ECX: Feature Flags::Extended
// [0:0] PNI
// [3:3] MONITOR/MWAIT
// [7:7] Enchanced Intel Speedstep Technology
// EDX: 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
// [22:16] Reserved
// [23:23] MMX Technology
// [24] FXSR: FSAVE/FXRSTOR (also indicates CR4.OSFXSR is available)
// [25] SSE: SSE Extensions
// [26] SSE2: SSE2 Extensions
// [28] Reserved
// [29] TM: Therm Monitor
// [31:30] Reserved
#if BX_SUPPORT_FPU
features |= 0x01;
#endif
#if (BX_CPU_LEVEL >= 5)
features |= (1<< 8); // Support CMPXCHG8B instruction
features |= (1<< 4); // implement TSC
features |= (1<< 5); // support RDMSR/WRMSR
#if BX_SUPPORT_MMX
features |= (1<<23); // support MMX
#endif
#endif
#if BX_CPU_LEVEL == 6
features |= (1<<15); // Implement CMOV instructions.
#if BX_SUPPORT_APIC
features |= (1<< 9); // APIC on chip
#endif
#if BX_SUPPORT_SSE >= 1
features |= (1<<24); // support FSAVE/FXRSTOR
features |= (1<<25); // support SSE
#endif
#if BX_SUPPORT_SSE >= 2
features |= (1<<26); // support SSE2
#endif
#endif
#if BX_SUPPORT_4MEG_PAGES
features |= (1<< 3); // Support Page-Size Extension (4M pages)
#endif
#if BX_SupportGlobalPages
features |= (1<<13); // Support Global pages.
#endif
#if BX_SupportPAE
features |= (1<< 6); // Support PAE.
#endif
#if BX_SUPPORT_SEP
features |= (1<<11); // SYSENTER/SYSEXIT
#endif
return features;
}
void BX_CPU_C::CPUID(bxInstruction_c *i)
{
#if BX_SUPPORT_X86_64
unsigned features;
#endif
invalidate_prefetch_q();
#if BX_CPU_LEVEL >= 4
switch (EAX) {
case 0:
// EAX: highest input value understood by CPUID
#if BX_CPU_LEVEL <= 6
RAX = 1; // 486 and Pentium processors
#else
RAX = 1; // for Pentium Pro, Pentium II, Pentium 4 processors
// should be 2, still not implemented
#endif
// EBX: vendor ID string
// EDX: vendor ID string
// ECX: vendor ID string
#if BX_SUPPORT_X86_64
RBX = 0x68747541; // "Auth"
RDX = 0x69746e65; // "enti"
RCX = 0x444d4163; // "cAMD"
#else
RBX = 0x756e6547; // "Genu"
RDX = 0x49656e69; // "ineI"
RCX = 0x6c65746e; // "ntel"
#endif
break;
case 1:
RAX = get_cpu_version_information();
RBX = 0; // still not implemented
RCX = get_extended_cpuid_features ();
RDX = get_std_cpuid_features ();
break;
#if 0
#if BX_CPU_LEVEL >= 6
case 2:
RAX = 0; // cache and TLB information (still not implemented)
RBX = 0; // cache and TLB information (still not implemented)
RCX = 0; // cache and TLB information (still not implemented)
RDX = 0; // cache and TLB information (still not implemented)
#endif
#endif
// Here should be extended information for Pentum 4 processor
// still not implemented ...
#if BX_SUPPORT_X86_64
// x86-64 functions
case 0x80000000:
// max function supported.
RAX = 0x80000008;
RBX = 0x68747541; // "Auth"
RDX = 0x69746e65; // "enti"
RCX = 0x444d4163; // "cAMD"
break;
case 0x80000001:
// long mode supported.
features = get_std_cpuid_features ();
RAX = features;
// Many of the bits in EDX are the same as EAX
// [10:10] Reserved
// [11:11] SYSCALL and SYSRET instructions
// [18:19] Reserved
// [20:20] No-Execute page protection
// [21:21] Reserved
// [22:22] AMD MMX Extensions
// [25:28] Reserved
// [29:29] Long Mode
// [30:30] AMD 3DNow Extensions
// [31:31] AMD 3DNow Intructions
features = features & 0x0183F3FF;
RDX = features | (1 << 29) | (1 << 11);
RBX = 0;
RCX = 0;
RDX = 0; // Reserved, undefined
break;
case 0x80000008:
// virtual & phys address size in low 2 bytes.
RAX = 0x00003028;
RBX = 0;
RCX = 0;
RDX = 0; // Reserved, undefined
break;
#endif // #if BX_SUPPORT_X86_64
default:
RAX = 0;
RBX = 0;
RCX = 0;
RDX = 0; // Reserved, undefined
break;
}
#else
BX_PANIC(("CPUID: not available on < late 486"));
#endif
}