diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-10-30 16:34:00 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-10-30 16:34:00 -0400 |
| commit | 503fb8ebed9d1ad4acc088b9d73a7725f3f0b983 (patch) | |
| tree | 9031ad93067cc1d792e8e262ce09504348fde22a /src/arch/x86 | |
| parent | bec1bfb493390fa084c672f7d76958777f85bbd1 (diff) | |
| download | gem5-503fb8ebed9d1ad4acc088b9d73a7725f3f0b983.tar.xz | |
X86: Compile fixes for 32 bit/debug/opt.
--HG--
extra : convert_revision : 591fffb316830fca5792666c8df12abd4e7c551b
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/faults.cc | 6 | ||||
| -rw-r--r-- | src/arch/x86/isa/microops/limmop.isa | 2 | ||||
| -rw-r--r-- | src/arch/x86/process.cc | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc index b9cac0297..13341f1de 100644 --- 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 c357c1d6c..6686444fd 100644 --- 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 c91bcc12f..c6246c76b 100644 --- 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) |