X86: Compile fixes for 32 bit/debug/opt.

--HG--
extra : convert_revision : 591fffb316830fca5792666c8df12abd4e7c551b

diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index b9cac0297ac6c66322e2f8b2fd7074e640df4e98..13341f1ded2a10a88624f6dbe986686c118fe23c 100644 (file)
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -124,7 +124,8 @@ namespace X86ISA
             panic("Tried to execute unmapped address %#x.\n", vaddr);
         } else {
             Addr alignedVaddr = p->pTable->pageAlign(vaddr);
-            DPRINTF(TLB, "Mapping %#x to %#x\n", alignedVaddr, entry.pageStart);
+            DPRINTF(TLB, "Mapping %#x to %#x\n", alignedVaddr,
+                    entry.pageStart());
             tc->getITBPtr()->insert(alignedVaddr, entry);
         }
     }
@@ -144,7 +145,8 @@ namespace X86ISA
             panic("Tried to access unmapped address %#x.\n", vaddr);
         } else {
             Addr alignedVaddr = p->pTable->pageAlign(vaddr);
-            DPRINTF(TLB, "Mapping %#x to %#x\n", alignedVaddr, entry.pageStart);
+            DPRINTF(TLB, "Mapping %#x to %#x\n", alignedVaddr,
+                    entry.pageStart());
             tc->getDTBPtr()->insert(alignedVaddr, entry);
         }
     }

diff --git a/src/arch/x86/isa/microops/limmop.isa b/src/arch/x86/isa/microops/limmop.isa
index c357c1d6c8809da3cd3436eb35023f67cb2b8203..6686444fd1711933775f3095df5a3b4c2b7eb5d0 100644 (file)
--- a/src/arch/x86/isa/microops/limmop.isa
+++ b/src/arch/x86/isa/microops/limmop.isa
@@ -148,6 +148,8 @@ let {{
             self.className = "Limm"
             self.mnemonic = "limm"
             self.dest = dest
+            if isinstance(imm, (int, long)):
+                imm = "ULL(%d)" % imm
             self.imm = imm
             self.dataSize = dataSize
 

diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index c91bcc12f428395273e7cacc545591998fba3c7f..c6246c76bd0bd65e59ce9deb2768d3a9dcead82d 100644 (file)
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -126,7 +126,7 @@ X86LiveProcess::X86LiveProcess(LiveProcessParams * params,
 
     // Set up region for mmaps. This was determined empirically and may not
     // always be correct.
-    mmap_start = mmap_end = 0x2aaaaaaab000;
+    mmap_start = mmap_end = (Addr)0x2aaaaaaab000ULL;
 }
 
 void X86LiveProcess::handleTrap(int trapNum, ThreadContext *tc)