diff options
| author | Gabe Black <gabeblack@google.com> | 2018-11-20 16:58:19 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-01-31 11:04:13 +0000 |
| commit | b859a7030d883cc208347387b19285c53b64fb54 (patch) | |
| tree | 3b70cba6c8c102bb07476ee69b0ce38ca6f86a09 /src/arch/x86/system.cc | |
| parent | ad775e013572aeb06ccff949dfd2cf7fffb5454f (diff) | |
| download | gem5-b859a7030d883cc208347387b19285c53b64fb54.tar.xz | |
x86: Stop using/defining some ISA specific register types.
These have been replaced with the generic RegVal type.
Change-Id: I75c1134212067dea43aa0903d813633e06f3d6c6
Reviewed-on: https://gem5-review.googlesource.com/c/14476
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/arch/x86/system.cc')
| -rw-r--r-- | src/arch/x86/system.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc index 0f85fdb38..3f44ece3a 100644 --- a/src/arch/x86/system.cc +++ b/src/arch/x86/system.cc @@ -100,7 +100,7 @@ X86ISA::installSegDesc(ThreadContext *tc, SegmentRegIndex seg, tc->setMiscReg(MISCREG_SEG_BASE(seg), desc.base); tc->setMiscReg(MISCREG_SEG_EFF_BASE(seg), honorBase ? desc.base : 0); tc->setMiscReg(MISCREG_SEG_LIMIT(seg), desc.limit); - tc->setMiscReg(MISCREG_SEG_ATTR(seg), (MiscReg)attr); + tc->setMiscReg(MISCREG_SEG_ATTR(seg), (RegVal)attr); } void @@ -175,7 +175,7 @@ X86System::initState() SegSelector cs = 0; cs.si = numGDTEntries - 1; - tc->setMiscReg(MISCREG_CS, (MiscReg)cs); + tc->setMiscReg(MISCREG_CS, (RegVal)cs); // 32 bit data segment SegDescriptor dsDesc = initDesc; @@ -188,11 +188,11 @@ X86System::initState() SegSelector ds = 0; ds.si = numGDTEntries - 1; - tc->setMiscReg(MISCREG_DS, (MiscReg)ds); - tc->setMiscReg(MISCREG_ES, (MiscReg)ds); - tc->setMiscReg(MISCREG_FS, (MiscReg)ds); - tc->setMiscReg(MISCREG_GS, (MiscReg)ds); - tc->setMiscReg(MISCREG_SS, (MiscReg)ds); + tc->setMiscReg(MISCREG_DS, (RegVal)ds); + tc->setMiscReg(MISCREG_ES, (RegVal)ds); + tc->setMiscReg(MISCREG_FS, (RegVal)ds); + tc->setMiscReg(MISCREG_GS, (RegVal)ds); + tc->setMiscReg(MISCREG_SS, (RegVal)ds); tc->setMiscReg(MISCREG_TSL, 0); tc->setMiscReg(MISCREG_TSG_BASE, GDTBase); @@ -208,7 +208,7 @@ X86System::initState() SegSelector tss = 0; tss.si = numGDTEntries - 1; - tc->setMiscReg(MISCREG_TR, (MiscReg)tss); + tc->setMiscReg(MISCREG_TR, (RegVal)tss); installSegDesc(tc, SYS_SEGMENT_REG_TR, tssDesc, true); /* |