Commit cb3df91a7102a79c28bb39113ef1454c342c2c7c

Authored by blueswir1
1 parent 3c924ac0

Fix debug message address formats

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4910 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 1 changed file with 15 additions and 8 deletions
hw/pcnet.c
... ... @@ -971,11 +971,12 @@ static void pcnet_rdte_poll(PCNetState *s)
971 971 s->csr[37] = nnrd >> 16;
972 972 #ifdef PCNET_DEBUG
973 973 if (bad) {
974   - printf("pcnet: BAD RMD RECORDS AFTER 0x%08x\n",
  974 + printf("pcnet: BAD RMD RECORDS AFTER 0x" TARGET_FMT_plx "\n",
975 975 PHYSADDR(s,crda));
976 976 }
977 977 } else {
978   - printf("pcnet: BAD RMD RDA=0x%08x\n", PHYSADDR(s,crda));
  978 + printf("pcnet: BAD RMD RDA=0x" TARGET_FMT_plx "\n",
  979 + PHYSADDR(s,crda));
979 980 #endif
980 981 }
981 982 }
... ... @@ -1743,7 +1744,8 @@ static void pcnet_mmio_writeb(void *opaque, target_phys_addr_t addr, uint32_t va
1743 1744 {
1744 1745 PCNetState *d = opaque;
1745 1746 #ifdef PCNET_DEBUG_IO
1746   - printf("pcnet_mmio_writeb addr=0x%08x val=0x%02x\n", addr, val);
  1747 + printf("pcnet_mmio_writeb addr=0x" TARGET_FMT_plx" val=0x%02x\n", addr,
  1748 + val);
1747 1749 #endif
1748 1750 if (!(addr & 0x10))
1749 1751 pcnet_aprom_writeb(d, addr & 0x0f, val);
... ... @@ -1756,7 +1758,8 @@ static uint32_t pcnet_mmio_readb(void *opaque, target_phys_addr_t addr)
1756 1758 if (!(addr & 0x10))
1757 1759 val = pcnet_aprom_readb(d, addr & 0x0f);
1758 1760 #ifdef PCNET_DEBUG_IO
1759   - printf("pcnet_mmio_readb addr=0x%08x val=0x%02x\n", addr, val & 0xff);
  1761 + printf("pcnet_mmio_readb addr=0x" TARGET_FMT_plx " val=0x%02x\n", addr,
  1762 + val & 0xff);
1760 1763 #endif
1761 1764 return val;
1762 1765 }
... ... @@ -1765,7 +1768,8 @@ static void pcnet_mmio_writew(void *opaque, target_phys_addr_t addr, uint32_t va
1765 1768 {
1766 1769 PCNetState *d = opaque;
1767 1770 #ifdef PCNET_DEBUG_IO
1768   - printf("pcnet_mmio_writew addr=0x%08x val=0x%04x\n", addr, val);
  1771 + printf("pcnet_mmio_writew addr=0x" TARGET_FMT_plx " val=0x%04x\n", addr,
  1772 + val);
1769 1773 #endif
1770 1774 if (addr & 0x10)
1771 1775 pcnet_ioport_writew(d, addr & 0x0f, val);
... ... @@ -1789,7 +1793,8 @@ static uint32_t pcnet_mmio_readw(void *opaque, target_phys_addr_t addr)
1789 1793 val |= pcnet_aprom_readb(d, addr);
1790 1794 }
1791 1795 #ifdef PCNET_DEBUG_IO
1792   - printf("pcnet_mmio_readw addr=0x%08x val = 0x%04x\n", addr, val & 0xffff);
  1796 + printf("pcnet_mmio_readw addr=0x" TARGET_FMT_plx" val = 0x%04x\n", addr,
  1797 + val & 0xffff);
1793 1798 #endif
1794 1799 return val;
1795 1800 }
... ... @@ -1798,7 +1803,8 @@ static void pcnet_mmio_writel(void *opaque, target_phys_addr_t addr, uint32_t va
1798 1803 {
1799 1804 PCNetState *d = opaque;
1800 1805 #ifdef PCNET_DEBUG_IO
1801   - printf("pcnet_mmio_writel addr=0x%08x val=0x%08x\n", addr, val);
  1806 + printf("pcnet_mmio_writel addr=0x" TARGET_FMT_plx" val=0x%08x\n", addr,
  1807 + val);
1802 1808 #endif
1803 1809 if (addr & 0x10)
1804 1810 pcnet_ioport_writel(d, addr & 0x0f, val);
... ... @@ -1828,7 +1834,8 @@ static uint32_t pcnet_mmio_readl(void *opaque, target_phys_addr_t addr)
1828 1834 val |= pcnet_aprom_readb(d, addr);
1829 1835 }
1830 1836 #ifdef PCNET_DEBUG_IO
1831   - printf("pcnet_mmio_readl addr=0x%08x val=0x%08x\n", addr, val);
  1837 + printf("pcnet_mmio_readl addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr,
  1838 + val);
1832 1839 #endif
1833 1840 return val;
1834 1841 }
... ...