# HG changeset patch
# User Gabe Black <[email protected]>
# Date 1257749398 28800
# Node ID 44010fc924d4778fb0900ff59704673767c76708
# Parent  b3ab661715ac41e528c48843ebfe5885aa33b7a7
X86: Don't panic on faults on prefetches in SE mode.

diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -637,17 +637,21 @@
                     success = p->pTable->lookup(vaddr, newEntry);
                 }
                 if (!success) {
-                    const char *modeStr = "";
-                    if (mode == Execute)
-                        modeStr = "execute";
-                    else if (mode == Read)
-                        modeStr = "read";
-                    else if (mode == Write)
-                        modeStr = "write";
-                    else
-                        modeStr = "?";
-                    panic("Tried to %s unmapped address %#x.\n",
-                            modeStr, vaddr);
+                    if (req->isPrefetch()) {
+                        return new PageFault(vaddr, true, mode, true, false);
+                    } else {
+                        const char *modeStr = "";
+                        if (mode == Execute)
+                            modeStr = "execute";
+                        else if (mode == Read)
+                            modeStr = "read";
+                        else if (mode == Write)
+                            modeStr = "write";
+                        else
+                            modeStr = "?";
+                        panic("Tried to %s unmapped address %#x.\n",
+                                modeStr, vaddr);
+                    }
                 } else {
                     Addr alignedVaddr = p->pTable->pageAlign(vaddr);
                     DPRINTF(TLB, "Mapping %#x to %#x\n", alignedVaddr,
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev

Reply via email to