From a7859f7e4541f2750df52ec725563d378ab7ddbb Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Sat, 31 Mar 2012 12:27:33 -0700
Subject: X86: Fix address size handling so real mode works properly.

Virtual (pre-segmentation) addresses are truncated based on address size, and
any non-64 bit linear address is truncated to 32 bits. This means that real
mode addresses aren't truncated down to 16 bits after their segment bases are
added in.
---
 src/arch/x86/tlb.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/arch/x86/tlb.cc')

diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index 89561f851..100f8cf0f 100644
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -281,6 +281,9 @@ TLB::translate(RequestPtr req, ThreadContext *tc, Translation *translation,
                     return new GeneralProtection(0);
             }
         }
+        if (m5Reg.mode != LongMode ||
+                (flags & (AddrSizeFlagBit << FlagShift)))
+            vaddr &= mask(32);
         // If paging is enabled, do the translation.
         if (m5Reg.paging) {
             DPRINTF(TLB, "Paging enabled.\n");
-- 
cgit v1.2.3