summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndrew Schultz <alschult@umich.edu>2004-05-06 15:21:07 -0400
committerAndrew Schultz <alschult@umich.edu>2004-05-06 15:21:07 -0400
commit4a5dcc37bfb26c152c195061fa70c7aa246b5ca6 (patch)
tree7c74980b640a7ffdca5bf601a0363c62b6b38257 /arch
parent8538ffdb3682d71c90c33b92b436a2d9cbdc42c3 (diff)
downloadgem5-4a5dcc37bfb26c152c195061fa70c7aa246b5ca6.tar.xz
Whole mess'o'changes.. see individual files
arch/alpha/vtophys.cc: Removed buggy code that tries to fix PAL addresses (may cause problems while trying to debug in PAL code, but that should do this fix outside of vtophys) base/loader/symtab.cc: base/loader/symtab.hh: cpu/exetrace.cc: Changed InstExec traces to always print a symbol name dev/ide_ctrl.cc: dev/ide_disk.cc: Tabs dev/ide_disk.hh: Change buffer size dev/tsunami_pchip.cc: Fix translatePciToDma to support scatter gather mapping kern/linux/linux_system.cc: Force simulator to wait until remote debugger attaches (should be removed or turned on/off with a flag) --HG-- extra : convert_revision : 1d08aebe3f448c87a963dd613de3e2e0cff0d48d
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/vtophys.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/alpha/vtophys.cc b/arch/alpha/vtophys.cc
index c5fe8df10..d91d80c83 100644
--- a/arch/alpha/vtophys.cc
+++ b/arch/alpha/vtophys.cc
@@ -96,9 +96,9 @@ vtophys(ExecContext *xc, Addr vaddr)
{
Addr ptbr = xc->regs.ipr[AlphaISA::IPR_PALtemp20];
Addr paddr = 0;
- if (PC_PAL(vaddr)) {
- paddr = vaddr & ~ULL(1);
- } else {
+// if (PC_PAL(vaddr)) {
+// paddr = vaddr & ~ULL(1);
+// } else {
if (vaddr >= ALPHA_K0SEG_BASE && vaddr <= ALPHA_K0SEG_END) {
paddr = ALPHA_K0SEG_TO_PHYS(vaddr);
} else if (!ptbr) {
@@ -109,7 +109,7 @@ vtophys(ExecContext *xc, Addr vaddr)
if (pte && entry_valid(entry))
paddr = PMAP_PTE_PA(entry) | (vaddr & PGOFSET);
}
- }
+// }
DPRINTF(VtoPhys, "vtophys(%#x) -> %#x\n", vaddr, paddr);