* Coding style cleanup, no functional change.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33792 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
parent
6c76785bef
commit
d337132b41
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
|
||||
* Copyright 2002-2009, Axel Dörfler, axeld@pinc-software.de.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
|
||||
@ -34,70 +34,70 @@
|
||||
#define IA32_MSR_MTRR_PHYSICAL_MASK_0 0x201
|
||||
|
||||
// x86 features from cpuid eax 1, edx register
|
||||
#define IA32_FEATURE_FPU 0x00000001 // x87 fpu
|
||||
#define IA32_FEATURE_VME 0x00000002 // virtual 8086
|
||||
#define IA32_FEATURE_DE 0x00000004 // debugging extensions
|
||||
#define IA32_FEATURE_PSE 0x00000008 // page size extensions
|
||||
#define IA32_FEATURE_TSC 0x00000010 // rdtsc instruction
|
||||
#define IA32_FEATURE_MSR 0x00000020 // rdmsr/wrmsr instruction
|
||||
#define IA32_FEATURE_PAE 0x00000040 // extended 3 level page table addressing
|
||||
#define IA32_FEATURE_MCE 0x00000080 // machine check exception
|
||||
#define IA32_FEATURE_CX8 0x00000100 // cmpxchg8b instruction
|
||||
#define IA32_FEATURE_APIC 0x00000200 // local apic on chip
|
||||
#define IA32_FEATURE_SEP 0x00000800 // SYSENTER/SYSEXIT
|
||||
#define IA32_FEATURE_MTRR 0x00001000 // MTRR
|
||||
#define IA32_FEATURE_PGE 0x00002000 // paging global bit
|
||||
#define IA32_FEATURE_MCA 0x00004000 // machine check architecture
|
||||
#define IA32_FEATURE_CMOV 0x00008000 // cmov instruction
|
||||
#define IA32_FEATURE_PAT 0x00010000 // page attribute table
|
||||
#define IA32_FEATURE_PSE36 0x00020000 // page size extensions with 4MB pages
|
||||
#define IA32_FEATURE_PSN 0x00040000 // processor serial number
|
||||
#define IA32_FEATURE_CLFSH 0x00080000 // cflush instruction
|
||||
#define IA32_FEATURE_DS 0x00200000 // debug store
|
||||
#define IA32_FEATURE_ACPI 0x00400000 // thermal monitor and clock ctrl
|
||||
#define IA32_FEATURE_MMX 0x00800000 // mmx instructions
|
||||
#define IA32_FEATURE_FXSR 0x01000000 // FXSAVE/FXRSTOR instruction
|
||||
#define IA32_FEATURE_SSE 0x02000000 // SSE
|
||||
#define IA32_FEATURE_SSE2 0x04000000 // SSE2
|
||||
#define IA32_FEATURE_SS 0x08000000 // self snoop
|
||||
#define IA32_FEATURE_HTT 0x10000000 // hyperthreading
|
||||
#define IA32_FEATURE_TM 0x20000000 // thermal monitor
|
||||
#define IA32_FEATURE_PBE 0x80000000 // pending break enable
|
||||
#define IA32_FEATURE_FPU 0x00000001 // x87 fpu
|
||||
#define IA32_FEATURE_VME 0x00000002 // virtual 8086
|
||||
#define IA32_FEATURE_DE 0x00000004 // debugging extensions
|
||||
#define IA32_FEATURE_PSE 0x00000008 // page size extensions
|
||||
#define IA32_FEATURE_TSC 0x00000010 // rdtsc instruction
|
||||
#define IA32_FEATURE_MSR 0x00000020 // rdmsr/wrmsr instruction
|
||||
#define IA32_FEATURE_PAE 0x00000040 // extended 3 level page table addressing
|
||||
#define IA32_FEATURE_MCE 0x00000080 // machine check exception
|
||||
#define IA32_FEATURE_CX8 0x00000100 // cmpxchg8b instruction
|
||||
#define IA32_FEATURE_APIC 0x00000200 // local apic on chip
|
||||
#define IA32_FEATURE_SEP 0x00000800 // SYSENTER/SYSEXIT
|
||||
#define IA32_FEATURE_MTRR 0x00001000 // MTRR
|
||||
#define IA32_FEATURE_PGE 0x00002000 // paging global bit
|
||||
#define IA32_FEATURE_MCA 0x00004000 // machine check architecture
|
||||
#define IA32_FEATURE_CMOV 0x00008000 // cmov instruction
|
||||
#define IA32_FEATURE_PAT 0x00010000 // page attribute table
|
||||
#define IA32_FEATURE_PSE36 0x00020000 // page size extensions with 4MB pages
|
||||
#define IA32_FEATURE_PSN 0x00040000 // processor serial number
|
||||
#define IA32_FEATURE_CLFSH 0x00080000 // cflush instruction
|
||||
#define IA32_FEATURE_DS 0x00200000 // debug store
|
||||
#define IA32_FEATURE_ACPI 0x00400000 // thermal monitor and clock ctrl
|
||||
#define IA32_FEATURE_MMX 0x00800000 // mmx instructions
|
||||
#define IA32_FEATURE_FXSR 0x01000000 // FXSAVE/FXRSTOR instruction
|
||||
#define IA32_FEATURE_SSE 0x02000000 // SSE
|
||||
#define IA32_FEATURE_SSE2 0x04000000 // SSE2
|
||||
#define IA32_FEATURE_SS 0x08000000 // self snoop
|
||||
#define IA32_FEATURE_HTT 0x10000000 // hyperthreading
|
||||
#define IA32_FEATURE_TM 0x20000000 // thermal monitor
|
||||
#define IA32_FEATURE_PBE 0x80000000 // pending break enable
|
||||
|
||||
// x86 features from cpuid eax 1, ecx register
|
||||
#define IA32_FEATURE_EXT_SSE3 0x00000001 // SSE3
|
||||
#define IA32_FEATURE_EXT_MONITOR 0x00000008 // MONITOR/MWAIT
|
||||
#define IA32_FEATURE_EXT_DSCPL 0x00000010 // CPL qualified debug store
|
||||
#define IA32_FEATURE_EXT_EST 0x00000080 // speedstep
|
||||
#define IA32_FEATURE_EXT_TM2 0x00000100 // thermal monitor 2
|
||||
#define IA32_FEATURE_EXT_CNXTID 0x00000400 // L1 context ID
|
||||
#define IA32_FEATURE_EXT_SSE3 0x00000001 // SSE3
|
||||
#define IA32_FEATURE_EXT_MONITOR 0x00000008 // MONITOR/MWAIT
|
||||
#define IA32_FEATURE_EXT_DSCPL 0x00000010 // CPL qualified debug store
|
||||
#define IA32_FEATURE_EXT_EST 0x00000080 // speedstep
|
||||
#define IA32_FEATURE_EXT_TM2 0x00000100 // thermal monitor 2
|
||||
#define IA32_FEATURE_EXT_CNXTID 0x00000400 // L1 context ID
|
||||
|
||||
// x86 features from cpuid eax 0x80000001, edx register (AMD)
|
||||
// only care about the ones that are unique to this register
|
||||
#define IA32_FEATURE_AMD_EXT_SYSCALL (1<<11) // SYSCALL/SYSRET
|
||||
#define IA32_FEATURE_AMD_EXT_NX (1<<20) // no execute bit
|
||||
#define IA32_FEATURE_AMD_EXT_MMXEXT (1<<22) // mmx extensions
|
||||
#define IA32_FEATURE_AMD_EXT_FFXSR (1<<25) // fast FXSAVE/FXRSTOR
|
||||
#define IA32_FEATURE_AMD_EXT_RDTSCP (1<<27) // rdtscp instruction
|
||||
#define IA32_FEATURE_AMD_EXT_LONG (1<<29) // long mode
|
||||
#define IA32_FEATURE_AMD_EXT_3DNOWEXT (1<<30) // 3DNow! extensions
|
||||
#define IA32_FEATURE_AMD_EXT_3DNOW (1<<31) // 3DNow!
|
||||
#define IA32_FEATURE_AMD_EXT_SYSCALL (1 << 11) // SYSCALL/SYSRET
|
||||
#define IA32_FEATURE_AMD_EXT_NX (1 << 20) // no execute bit
|
||||
#define IA32_FEATURE_AMD_EXT_MMXEXT (1 << 22) // mmx extensions
|
||||
#define IA32_FEATURE_AMD_EXT_FFXSR (1 << 25) // fast FXSAVE/FXRSTOR
|
||||
#define IA32_FEATURE_AMD_EXT_RDTSCP (1 << 27) // rdtscp instruction
|
||||
#define IA32_FEATURE_AMD_EXT_LONG (1 << 29) // long mode
|
||||
#define IA32_FEATURE_AMD_EXT_3DNOWEXT (1 << 30) // 3DNow! extensions
|
||||
#define IA32_FEATURE_AMD_EXT_3DNOW (1 << 31) // 3DNow!
|
||||
|
||||
// cr4 flags
|
||||
#define IA32_CR4_GLOBAL_PAGES (1UL << 7)
|
||||
#define IA32_CR4_GLOBAL_PAGES (1UL << 7)
|
||||
|
||||
// Memory type ranges
|
||||
#define IA32_MTR_UNCACHED 0
|
||||
#define IA32_MTR_WRITE_COMBINING 1
|
||||
#define IA32_MTR_WRITE_THROUGH 4
|
||||
#define IA32_MTR_WRITE_PROTECTED 5
|
||||
#define IA32_MTR_WRITE_BACK 6
|
||||
#define IA32_MTR_UNCACHED 0
|
||||
#define IA32_MTR_WRITE_COMBINING 1
|
||||
#define IA32_MTR_WRITE_THROUGH 4
|
||||
#define IA32_MTR_WRITE_PROTECTED 5
|
||||
#define IA32_MTR_WRITE_BACK 6
|
||||
|
||||
|
||||
// iframe types
|
||||
#define IFRAME_TYPE_SYSCALL 0x1
|
||||
#define IFRAME_TYPE_OTHER 0x2
|
||||
#define IFRAME_TYPE_MASK 0xf
|
||||
#define IFRAME_TYPE_SYSCALL 0x1
|
||||
#define IFRAME_TYPE_OTHER 0x2
|
||||
#define IFRAME_TYPE_MASK 0xf
|
||||
|
||||
|
||||
#ifndef _ASSEMBLER
|
||||
@ -114,9 +114,10 @@ typedef struct x86_cpu_module_info {
|
||||
uint32 (*count_mtrrs)(void);
|
||||
void (*init_mtrrs)(void);
|
||||
|
||||
void (*set_mtrr)(uint32 index, uint64 base, uint64 length, uint8 type);
|
||||
status_t (*get_mtrr)(uint32 index, uint64 *_base, uint64 *_length,
|
||||
uint8 *_type);
|
||||
void (*set_mtrr)(uint32 index, uint64 base, uint64 length,
|
||||
uint8 type);
|
||||
status_t (*get_mtrr)(uint32 index, uint64* _base, uint64* _length,
|
||||
uint8* _type);
|
||||
|
||||
void (*get_optimized_functions)(x86_optimized_functions* functions);
|
||||
} x86_cpu_module_info;
|
||||
@ -198,9 +199,9 @@ struct vm86_iframe {
|
||||
uint16 gs, __gsh;
|
||||
};
|
||||
|
||||
#define IFRAME_IS_USER(f) ( ((f)->cs == USER_CODE_SEG) \
|
||||
|| (((f)->flags & 0x20000) != 0 ))
|
||||
#define IFRAME_IS_VM86(f) ( ((f)->flags & 0x20000) != 0 )
|
||||
#define IFRAME_IS_USER(f) ((f)->cs == USER_CODE_SEG \
|
||||
|| ((f)->flags & 0x20000) != 0)
|
||||
#define IFRAME_IS_VM86(f) (((f)->flags & 0x20000) != 0)
|
||||
|
||||
// features
|
||||
enum x86_feature_type {
|
||||
@ -228,22 +229,22 @@ enum x86_vendors {
|
||||
|
||||
typedef struct arch_cpu_info {
|
||||
// saved cpu info
|
||||
enum x86_vendors vendor;
|
||||
uint32 feature[FEATURE_NUM];
|
||||
char model_name[49];
|
||||
const char *vendor_name;
|
||||
int type;
|
||||
int family;
|
||||
int extended_family;
|
||||
int stepping;
|
||||
int model;
|
||||
int extended_model;
|
||||
enum x86_vendors vendor;
|
||||
uint32 feature[FEATURE_NUM];
|
||||
char model_name[49];
|
||||
const char* vendor_name;
|
||||
int type;
|
||||
int family;
|
||||
int extended_family;
|
||||
int stepping;
|
||||
int model;
|
||||
int extended_model;
|
||||
|
||||
struct vm_translation_map_arch_info* active_translation_map;
|
||||
|
||||
// local TSS for this cpu
|
||||
struct tss tss;
|
||||
struct tss double_fault_tss;
|
||||
struct tss tss;
|
||||
struct tss double_fault_tss;
|
||||
} arch_cpu_info;
|
||||
|
||||
#ifdef __cplusplus
|
||||
@ -254,20 +255,21 @@ extern "C" {
|
||||
|
||||
struct arch_thread;
|
||||
|
||||
void __x86_setup_system_time(uint32 cv_factor);
|
||||
void i386_context_switch(struct arch_thread *old_state, struct arch_thread *new_state, addr_t new_pgdir);
|
||||
void __x86_setup_system_time(uint32 conversionFactor);
|
||||
void i386_context_switch(struct arch_thread* oldState,
|
||||
struct arch_thread* newState, addr_t newPageDir);
|
||||
void x86_userspace_thread_exit(void);
|
||||
void x86_end_userspace_thread_exit(void);
|
||||
void x86_enter_userspace(addr_t entry, addr_t stackTop);
|
||||
void i386_set_tss_and_kstack(addr_t kstack);
|
||||
void i386_switch_stack_and_call(addr_t stack, void (*func)(void *), void *arg);
|
||||
void i386_swap_pgdir(addr_t new_pgdir);
|
||||
void i386_fnsave(void *fpu_state);
|
||||
void i386_fxsave(void *fpu_state);
|
||||
void i386_frstor(const void *fpu_state);
|
||||
void i386_fxrstor(const void *fpu_state);
|
||||
void i386_fnsave_swap(void *old_fpu_state, const void *new_fpu_state);
|
||||
void i386_fxsave_swap(void *old_fpu_state, const void *new_fpu_state);
|
||||
void i386_switch_stack_and_call(addr_t stack, void (*func)(void*), void* arg);
|
||||
void i386_swap_pgdir(addr_t newPageDir);
|
||||
void i386_fnsave(void* fpuState);
|
||||
void i386_fxsave(void* fpuState);
|
||||
void i386_frstor(const void* fpuState);
|
||||
void i386_fxrstor(const void* fpuState);
|
||||
void i386_fnsave_swap(void* oldFpuState, const void* newFpuState);
|
||||
void i386_fxsave_swap(void* oldFpuState, const void* newFpuState);
|
||||
uint32 x86_read_ebp();
|
||||
uint32 x86_read_cr0();
|
||||
void x86_write_cr0(uint32 value);
|
||||
@ -279,7 +281,8 @@ void x86_set_task_gate(int32 cpu, int32 n, int32 segment);
|
||||
void* x86_get_idt(int32 cpu);
|
||||
uint32 x86_count_mtrrs(void);
|
||||
void x86_set_mtrr(uint32 index, uint64 base, uint64 length, uint8 type);
|
||||
status_t x86_get_mtrr(uint32 index, uint64 *_base, uint64 *_length, uint8 *_type);
|
||||
status_t x86_get_mtrr(uint32 index, uint64* _base, uint64* _length,
|
||||
uint8* _type);
|
||||
bool x86_check_feature(uint32 feature, enum x86_feature_type type);
|
||||
void* x86_get_double_fault_stack(int32 cpu, size_t* _size);
|
||||
int32 x86_double_fault_get_cpu(void);
|
||||
@ -347,7 +350,7 @@ void x86_page_fault_exception_double_fault(struct iframe* frame);
|
||||
_v; \
|
||||
})
|
||||
|
||||
extern segment_descriptor *gGDT;
|
||||
extern segment_descriptor* gGDT;
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Loading…
Reference in New Issue
Block a user