derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quell gcc 4.3 warning

Browse Source
This commit is contained in:
Nathan Binkert
2009-02-27 17:29:58 -08:00
parent b69a9ad45a
commit 4523741c1c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/x86/tlb.cc
View File

@@ -590,8 +590,8 @@ TLB::translate(RequestPtr req, ThreadContext *tc,
// address size is 64 bits, overridable to 32.
int size = 32;
bool sizeOverride = (flags & (AddrSizeFlagBit << FlagShift));
if (csAttr.defaultSize && sizeOverride ||
!csAttr.defaultSize && !sizeOverride)
if ((csAttr.defaultSize && sizeOverride) ||
(!csAttr.defaultSize && !sizeOverride))
size = 16;
Addr offset = bits(vaddr - base, size-1, 0);
Addr endOffset = offset + req->getSize() - 1;
@@ -647,8 +647,8 @@ TLB::translate(RequestPtr req, ThreadContext *tc,
// Do paging protection checks.
bool inUser = (csAttr.dpl == 3 &&
!(flags & (CPL0FlagBit << FlagShift)));
if (inUser && !entry->user ||
write && !entry->writable) {
if ((inUser && !entry->user) ||
(write && !entry->writable)) {
// The page must have been present to get into the TLB in
// the first place. We'll assume the reserved bits are
// fine even though we're not checking them.