diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/msr/Msr.cpp | 41 | ||||
| -rw-r--r-- | arch/x86/msr/Msr.h | 1 |
2 files changed, 26 insertions, 16 deletions
diff --git a/arch/x86/msr/Msr.cpp b/arch/x86/msr/Msr.cpp index 6d21b54..7420ab7 100644 --- a/arch/x86/msr/Msr.cpp +++ b/arch/x86/msr/Msr.cpp @@ -1,11 +1,14 @@ #include "Msr.h" +#include "../cpuid/Cpuid.h" Msr::Msr() { - Cpuinfo cpuinfo; - cpuinfo.cpuid(Cpuinfo::VersionInfo); + cpuid::VersionInfo vinfo; + cpuid::Executor executor; - msrSupport = cpuinfo.getRegs().edx & Cpuinfo::MSR; + executor.cpuid(vinfo); + + msrSupport = vinfo.edx & cpuid::VersionInfo::EdxFlags::MSR; }; bool Msr::rdmsr(MsrCommand *cmd) @@ -50,18 +53,26 @@ bool Msr::wrmsr(MsrCommand *cmd) Ia32ApicBase::Ia32ApicBase() { - Cpuinfo cpuinfo; - bool cpuidAddrSzNotSupport = cpuinfo.cpuid(Cpuinfo::AddressSize); - cpuidOutputRegisters AddrSzRegs = cpuinfo.getRegs(); - - cpuinfo.cpuid(Cpuinfo::VersionInfo); - if(cpuinfo.getRegs().edx & Cpuinfo::PAE - and cpuidAddrSzNotSupport) maxPhyAddr = 36; - else if(cpuidAddrSzNotSupport) maxPhyAddr = 32; - else if(!cpuidAddrSzNotSupport) maxPhyAddr = (uint8)AddrSzRegs.edx; - - bspFlag = enableFlag = false; - baseField = NULL; + cpuid::Executor executor; + cpuid::VersionInfo verInfo; + cpuid::ExtendedAddressSize addrSize; + executor.cpuid(verInfo); + executor.cpuid(addrSize); + + if(verInfo.isValid + and verInfo.edx & cpuid::VersionInfo::EdxFlags::PAE + and !addrSize.isValid) + { + maxPhyAddr = 36; + } + else if(!addrSize.isValid) + { + maxPhyAddr = 32; + } + else if(addrSize.isValid) + { + maxPhyAddr = addrSize.eax.physicalAddressBits; + } }; uint32 Ia32ApicBase::getCommand() diff --git a/arch/x86/msr/Msr.h b/arch/x86/msr/Msr.h index 98c1b02..8262757 100644 --- a/arch/x86/msr/Msr.h +++ b/arch/x86/msr/Msr.h @@ -2,7 +2,6 @@ // 1) Implement msr write and save functions // 2) Ia32ApicBase field -#include "../cpuinfo/Cpuinfo.h" #include <MemoryOperations.h> #ifndef MSR_H |