Remote an old hack that is now unnecessary

base/cprintf_formats.hh:
    Add additional format modifiers

--HG--
extra : convert_revision : f9ec0a664eeb96db7dacacd6b7636e3cb47555e7

diff --git a/arch/alpha/vtophys.cc b/arch/alpha/vtophys.cc
index 784c4af7e94d42b23572063f97aabc6073068196..c5fe8df10d400163c8d3e1830b6ef9ecc0f09d5c 100644 (file)
--- a/arch/alpha/vtophys.cc
+++ b/arch/alpha/vtophys.cc
@@ -96,13 +96,13 @@ vtophys(ExecContext *xc, Addr vaddr)
 {
     Addr ptbr = xc->regs.ipr[AlphaISA::IPR_PALtemp20];
     Addr paddr = 0;
-    if (PC_PAL(vaddr) || vaddr < 0x10000) {
+    if (PC_PAL(vaddr)) {
         paddr = vaddr & ~ULL(1);
-    } else if (!ptbr) {
-        paddr = vaddr;
     } else {
         if (vaddr >= ALPHA_K0SEG_BASE && vaddr <= ALPHA_K0SEG_END) {
             paddr = ALPHA_K0SEG_TO_PHYS(vaddr);
+        } else if (!ptbr) {
+            paddr = vaddr;
         } else {
             Addr pte = kernel_pte_lookup(xc->physmem, ptbr, vaddr);
             uint64_t entry = xc->physmem->phys_read_qword(pte);

diff --git a/base/cprintf_formats.hh b/base/cprintf_formats.hh
index d8a8a552be9b97589929589bd1371a04cbebacc5..120dd94b17b63aa4d61abc42f765945b73a41962 100644 (file)
--- a/base/cprintf_formats.hh
+++ b/base/cprintf_formats.hh
@@ -279,8 +279,6 @@ template <typename T>
 inline void
 format_integer(std::ostream &out, const T &data, Format &fmt)
 { _format_integer(out, data, fmt); }
-
-#if 0
 inline void
 format_integer(std::ostream &out, char data, Format &fmt)
 { _format_integer(out, data, fmt); }
@@ -290,6 +288,7 @@ format_integer(std::ostream &out, unsigned char data, Format &fmt)
 inline void
 format_integer(std::ostream &out, signed char data, Format &fmt)
 { _format_integer(out, data, fmt); }
+#if 0
 inline void
 format_integer(std::ostream &out, short data, Format &fmt)
 { _format_integer(out, data, fmt); }