From f0bef2e9a73f7df65de5f9b93fbdbc275c5d22e9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 31 Oct 2021 23:55:51 -0400
Subject: [PATCH] sim: bfin: cast pointers using uintptr_t

We can't assume that sizeof(long) == sizeof(void*), so change all
these casts over to uintptr_t.
---
 sim/bfin/dv-bfin_cec.c       |  2 +-
 sim/bfin/dv-bfin_ctimer.c    |  4 ++--
 sim/bfin/dv-bfin_dma.c       |  4 ++--
 sim/bfin/dv-bfin_ebiu_amc.c  |  2 +-
 sim/bfin/dv-bfin_ebiu_ddrc.c |  4 ++--
 sim/bfin/dv-bfin_ebiu_sdc.c  |  4 ++--
 sim/bfin/dv-bfin_emac.c      |  4 ++--
 sim/bfin/dv-bfin_eppi.c      |  4 ++--
 sim/bfin/dv-bfin_gpio.c      |  4 ++--
 sim/bfin/dv-bfin_gpio2.c     |  4 ++--
 sim/bfin/dv-bfin_gptimer.c   |  4 ++--
 sim/bfin/dv-bfin_jtag.c      |  4 ++--
 sim/bfin/dv-bfin_mmu.c       |  4 ++--
 sim/bfin/dv-bfin_nfc.c       |  4 ++--
 sim/bfin/dv-bfin_otp.c       |  6 +++---
 sim/bfin/dv-bfin_pfmon.c     |  4 ++--
 sim/bfin/dv-bfin_pint.c      |  4 ++--
 sim/bfin/dv-bfin_pll.c       |  4 ++--
 sim/bfin/dv-bfin_ppi.c       |  4 ++--
 sim/bfin/dv-bfin_rtc.c       |  4 ++--
 sim/bfin/dv-bfin_sic.c       | 16 ++++++++--------
 sim/bfin/dv-bfin_spi.c       |  4 ++--
 sim/bfin/dv-bfin_twi.c       |  4 ++--
 sim/bfin/dv-bfin_uart.c      |  4 ++--
 sim/bfin/dv-bfin_uart2.c     |  4 ++--
 sim/bfin/dv-bfin_wdog.c      |  4 ++--
 sim/bfin/dv-bfin_wp.c        |  4 ++--
 sim/bfin/dv-eth_phy.c        |  4 ++--
 28 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/sim/bfin/dv-bfin_cec.c b/sim/bfin/dv-bfin_cec.c
index 7ad3ea06800..3cd7cb3278b 100644
--- a/sim/bfin/dv-bfin_cec.c
+++ b/sim/bfin/dv-bfin_cec.c
@@ -131,7 +131,7 @@ bfin_cec_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - cec->base;
-  valuep = (void *)((unsigned long)cec + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)cec + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_ctimer.c b/sim/bfin/dv-bfin_ctimer.c
index df62d9487e6..b826a60002a 100644
--- a/sim/bfin/dv-bfin_ctimer.c
+++ b/sim/bfin/dv-bfin_ctimer.c
@@ -134,7 +134,7 @@ bfin_ctimer_io_write_buffer (struct hw *me, const void *source,
 
   value = dv_load_4 (source);
   mmr_off = addr - ctimer->base;
-  valuep = (void *)((unsigned long)ctimer + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)ctimer + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -202,7 +202,7 @@ bfin_ctimer_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - ctimer->base;
-  valuep = (void *)((unsigned long)ctimer + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)ctimer + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_dma.c b/sim/bfin/dv-bfin_dma.c
index d7dc541dd8c..4651e6224f1 100644
--- a/sim/bfin/dv-bfin_dma.c
+++ b/sim/bfin/dv-bfin_dma.c
@@ -331,7 +331,7 @@ bfin_dma_io_write_buffer (struct hw *me, const void *source, int space,
     value = dv_load_2 (source);
 
   mmr_off = addr % dma->base;
-  valuep = (void *)((unsigned long)dma + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)dma + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -429,7 +429,7 @@ bfin_dma_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr % dma->base;
-  valuep = (void *)((unsigned long)dma + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)dma + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_ebiu_amc.c b/sim/bfin/dv-bfin_ebiu_amc.c
index 29c4c4a5a9f..aba9c50e68f 100644
--- a/sim/bfin/dv-bfin_ebiu_amc.c
+++ b/sim/bfin/dv-bfin_ebiu_amc.c
@@ -331,7 +331,7 @@ bfin_ebiu_amc_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - amc->base;
-  valuep = (void *)((unsigned long)amc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)amc + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_ebiu_ddrc.c b/sim/bfin/dv-bfin_ebiu_ddrc.c
index 4160cb210e5..e82a1352883 100644
--- a/sim/bfin/dv-bfin_ebiu_ddrc.c
+++ b/sim/bfin/dv-bfin_ebiu_ddrc.c
@@ -79,7 +79,7 @@ bfin_ebiu_ddrc_io_write_buffer (struct hw *me, const void *source,
     value = dv_load_2 (source);
 
   mmr_off = addr - ddrc->base;
-  valuep = (void *)((unsigned long)ddrc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)ddrc + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -118,7 +118,7 @@ bfin_ebiu_ddrc_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - ddrc->base;
-  valuep = (void *)((unsigned long)ddrc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)ddrc + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_ebiu_sdc.c b/sim/bfin/dv-bfin_ebiu_sdc.c
index 4af04dcdac4..9347d7c6938 100644
--- a/sim/bfin/dv-bfin_ebiu_sdc.c
+++ b/sim/bfin/dv-bfin_ebiu_sdc.c
@@ -67,7 +67,7 @@ bfin_ebiu_sdc_io_write_buffer (struct hw *me, const void *source,
     value = dv_load_2 (source);
 
   mmr_off = addr - sdc->base;
-  valuep = (void *)((unsigned long)sdc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sdc + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -123,7 +123,7 @@ bfin_ebiu_sdc_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - sdc->base;
-  valuep = (void *)((unsigned long)sdc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sdc + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_emac.c b/sim/bfin/dv-bfin_emac.c
index e5ceedbef51..143d07a1437 100644
--- a/sim/bfin/dv-bfin_emac.c
+++ b/sim/bfin/dv-bfin_emac.c
@@ -185,7 +185,7 @@ bfin_emac_io_write_buffer (struct hw *me, const void *source,
   value = dv_load_4 (source);
 
   mmr_off = addr - emac->base;
-  valuep = (void *)((unsigned long)emac + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)emac + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -286,7 +286,7 @@ bfin_emac_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - emac->base;
-  valuep = (void *)((unsigned long)emac + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)emac + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_eppi.c b/sim/bfin/dv-bfin_eppi.c
index 169895d3dd4..f31782b7f37 100644
--- a/sim/bfin/dv-bfin_eppi.c
+++ b/sim/bfin/dv-bfin_eppi.c
@@ -101,7 +101,7 @@ bfin_eppi_io_write_buffer (struct hw *me, const void *source,
     value = dv_load_2 (source);
 
   mmr_off = addr - eppi->base;
-  valuep = (void *)((unsigned long)eppi + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)eppi + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -162,7 +162,7 @@ bfin_eppi_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - eppi->base;
-  valuep = (void *)((unsigned long)eppi + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)eppi + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_gpio.c b/sim/bfin/dv-bfin_gpio.c
index bbcc54f0fb5..12f0c4df9f3 100644
--- a/sim/bfin/dv-bfin_gpio.c
+++ b/sim/bfin/dv-bfin_gpio.c
@@ -117,7 +117,7 @@ bfin_gpio_io_write_buffer (struct hw *me, const void *source, int space,
 
   value = dv_load_2 (source);
   mmr_off = addr - port->base;
-  valuep = (void *)((unsigned long)port + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)port + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -190,7 +190,7 @@ bfin_gpio_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - port->base;
-  valuep = (void *)((unsigned long)port + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)port + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_gpio2.c b/sim/bfin/dv-bfin_gpio2.c
index 61c99802c13..0cb91e7c608 100644
--- a/sim/bfin/dv-bfin_gpio2.c
+++ b/sim/bfin/dv-bfin_gpio2.c
@@ -83,7 +83,7 @@ bfin_gpio_io_write_buffer (struct hw *me, const void *source, int space,
     value = dv_load_4 (source);
   else
     value = dv_load_2 (source);
-  valuep = (void *)((unsigned long)port + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)port + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -166,7 +166,7 @@ bfin_gpio_io_read_buffer (struct hw *me, void *dest, int space,
     if (!dv_bfin_mmr_require_16 (me, addr, nr_bytes, false))
       return 0;
 
-  valuep = (void *)((unsigned long)port + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)port + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_gptimer.c b/sim/bfin/dv-bfin_gptimer.c
index 3dfa2b58e91..685c48e97ef 100644
--- a/sim/bfin/dv-bfin_gptimer.c
+++ b/sim/bfin/dv-bfin_gptimer.c
@@ -72,7 +72,7 @@ bfin_gptimer_io_write_buffer (struct hw *me, const void *source, int space,
     value = dv_load_2 (source);
 
   mmr_off = addr - gptimer->base;
-  valuep = (void *)((unsigned long)gptimer + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)gptimer + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -115,7 +115,7 @@ bfin_gptimer_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - gptimer->base;
-  valuep = (void *)((unsigned long)gptimer + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)gptimer + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_jtag.c b/sim/bfin/dv-bfin_jtag.c
index 12629970cc8..5a0be0cbab6 100644
--- a/sim/bfin/dv-bfin_jtag.c
+++ b/sim/bfin/dv-bfin_jtag.c
@@ -61,7 +61,7 @@ bfin_jtag_io_write_buffer (struct hw *me, const void *source, int space,
 
   value = dv_load_4 (source);
   mmr_off = addr - jtag->base;
-  valuep = (void *)((unsigned long)jtag + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)jtag + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -95,7 +95,7 @@ bfin_jtag_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - jtag->base;
-  valuep = (void *)((unsigned long)jtag + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)jtag + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_mmu.c b/sim/bfin/dv-bfin_mmu.c
index cadc9df552e..263d5b20cea 100644
--- a/sim/bfin/dv-bfin_mmu.c
+++ b/sim/bfin/dv-bfin_mmu.c
@@ -109,7 +109,7 @@ bfin_mmu_io_write_buffer (struct hw *me, const void *source,
   value = dv_load_4 (source);
 
   mmr_off = addr - mmu->base;
-  valuep = (void *)((unsigned long)mmu + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)mmu + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -183,7 +183,7 @@ bfin_mmu_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - mmu->base;
-  valuep = (void *)((unsigned long)mmu + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)mmu + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_nfc.c b/sim/bfin/dv-bfin_nfc.c
index 80fe49da72c..17048a883cc 100644
--- a/sim/bfin/dv-bfin_nfc.c
+++ b/sim/bfin/dv-bfin_nfc.c
@@ -84,7 +84,7 @@ bfin_nfc_io_write_buffer (struct hw *me, const void *source, int space,
 
   value = dv_load_2 (source);
   mmr_off = addr - nfc->base;
-  valuep = (void *)((unsigned long)nfc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)nfc + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -134,7 +134,7 @@ bfin_nfc_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - nfc->base;
-  valuep = (void *)((unsigned long)nfc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)nfc + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_otp.c b/sim/bfin/dv-bfin_otp.c
index a9f768d0c0e..8aabe483c8b 100644
--- a/sim/bfin/dv-bfin_otp.c
+++ b/sim/bfin/dv-bfin_otp.c
@@ -116,7 +116,7 @@ bfin_otp_io_write_buffer (struct hw *me, const void *source, int space,
     value = dv_load_2 (source);
 
   mmr_off = addr - otp->base;
-  valuep = (void *)((unsigned long)otp + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)otp + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -192,7 +192,7 @@ bfin_otp_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - otp->base;
-  valuep = (void *)((unsigned long)otp + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)otp + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -280,7 +280,7 @@ bfin_otp_finish (struct hw *me)
   otp->timing  = 0x00001485;
 
   /* Semi-random value for unique chip id.  */
-  bfin_otp_write_page_val2 (otp, FPS00, (unsigned long)otp, ~(unsigned long)otp);
+  bfin_otp_write_page_val2 (otp, FPS00, (uintptr_t)otp, ~(uintptr_t)otp);
 
   memset (part_str, 0, sizeof (part_str));
   sprintf (part_str, "ADSP-BF%iX", type);
diff --git a/sim/bfin/dv-bfin_pfmon.c b/sim/bfin/dv-bfin_pfmon.c
index bffe67b18a0..bbcb4d6c3c9 100644
--- a/sim/bfin/dv-bfin_pfmon.c
+++ b/sim/bfin/dv-bfin_pfmon.c
@@ -60,7 +60,7 @@ bfin_pfmon_io_write_buffer (struct hw *me, const void *source, int space,
 
   value = dv_load_4 (source);
   mmr_off = addr - pfmon->base;
-  valuep = (void *)((unsigned long)pfmon + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)pfmon + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -93,7 +93,7 @@ bfin_pfmon_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - pfmon->base;
-  valuep = (void *)((unsigned long)pfmon + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)pfmon + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_pint.c b/sim/bfin/dv-bfin_pint.c
index b4f4f40ab65..8a153282b3b 100644
--- a/sim/bfin/dv-bfin_pint.c
+++ b/sim/bfin/dv-bfin_pint.c
@@ -74,7 +74,7 @@ bfin_pint_io_write_buffer (struct hw *me, const void *source, int space,
   else
     value = dv_load_2 (source);
   mmr_off = addr - pint->base;
-  valuep = (void *)((unsigned long)pint + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)pint + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -143,7 +143,7 @@ bfin_pint_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - pint->base;
-  valuep = (void *)((unsigned long)pint + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)pint + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_pll.c b/sim/bfin/dv-bfin_pll.c
index e2a5f5cd55c..0e2c1343ec8 100644
--- a/sim/bfin/dv-bfin_pll.c
+++ b/sim/bfin/dv-bfin_pll.c
@@ -70,7 +70,7 @@ bfin_pll_io_write_buffer (struct hw *me, const void *source,
     value = dv_load_2 (source);
 
   mmr_off = addr - pll->base;
-  valuep = (void *)((unsigned long)pll + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)pll + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -109,7 +109,7 @@ bfin_pll_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - pll->base;
-  valuep = (void *)((unsigned long)pll + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)pll + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_ppi.c b/sim/bfin/dv-bfin_ppi.c
index a67dc5eecb0..6eff08e4407 100644
--- a/sim/bfin/dv-bfin_ppi.c
+++ b/sim/bfin/dv-bfin_ppi.c
@@ -92,7 +92,7 @@ bfin_ppi_io_write_buffer (struct hw *me, const void *source, int space,
 
   value = dv_load_2 (source);
   mmr_off = addr - ppi->base;
-  valuep = (void *)((unsigned long)ppi + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)ppi + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -131,7 +131,7 @@ bfin_ppi_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - ppi->base;
-  valuep = (void *)((unsigned long)ppi + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)ppi + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_rtc.c b/sim/bfin/dv-bfin_rtc.c
index 06ae4249d6e..2f24360a7e2 100644
--- a/sim/bfin/dv-bfin_rtc.c
+++ b/sim/bfin/dv-bfin_rtc.c
@@ -72,7 +72,7 @@ bfin_rtc_io_write_buffer (struct hw *me, const void *source,
     value = dv_load_2 (source);
 
   mmr_off = addr - rtc->base;
-  valuep = (void *)((unsigned long)rtc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)rtc + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -114,7 +114,7 @@ bfin_rtc_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - rtc->base;
-  valuep = (void *)((unsigned long)rtc + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)rtc + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_sic.c b/sim/bfin/dv-bfin_sic.c
index cc90a4cf22a..da77edada40 100644
--- a/sim/bfin/dv-bfin_sic.c
+++ b/sim/bfin/dv-bfin_sic.c
@@ -161,7 +161,7 @@ bfin_sic_52x_io_write_buffer (struct hw *me, const void *source, int space,
     value = dv_load_2 (source);
 
   mmr_off = addr - sic->base;
-  valuep = (void *)((unsigned long)sic + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -214,7 +214,7 @@ bfin_sic_52x_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - sic->base;
-  valuep = (void *)((unsigned long)sic + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -275,7 +275,7 @@ bfin_sic_537_io_write_buffer (struct hw *me, const void *source, int space,
     value = dv_load_2 (source);
 
   mmr_off = addr - sic->base;
-  valuep = (void *)((unsigned long)sic + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -327,7 +327,7 @@ bfin_sic_537_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - sic->base;
-  valuep = (void *)((unsigned long)sic + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -389,7 +389,7 @@ bfin_sic_54x_io_write_buffer (struct hw *me, const void *source, int space,
     value = dv_load_2 (source);
 
   mmr_off = addr - sic->base;
-  valuep = (void *)((unsigned long)sic + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -438,7 +438,7 @@ bfin_sic_54x_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - sic->base;
-  valuep = (void *)((unsigned long)sic + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -496,7 +496,7 @@ bfin_sic_561_io_write_buffer (struct hw *me, const void *source, int space,
     value = dv_load_2 (source);
 
   mmr_off = addr - sic->base;
-  valuep = (void *)((unsigned long)sic + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -549,7 +549,7 @@ bfin_sic_561_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - sic->base;
-  valuep = (void *)((unsigned long)sic + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)sic + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_spi.c b/sim/bfin/dv-bfin_spi.c
index c0869fcf77c..d56b38ba0f8 100644
--- a/sim/bfin/dv-bfin_spi.c
+++ b/sim/bfin/dv-bfin_spi.c
@@ -84,7 +84,7 @@ bfin_spi_io_write_buffer (struct hw *me, const void *source, int space,
 
   value = dv_load_2 (source);
   mmr_off = addr - spi->base;
-  valuep = (void *)((unsigned long)spi + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)spi + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -129,7 +129,7 @@ bfin_spi_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - spi->base;
-  valuep = (void *)((unsigned long)spi + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)spi + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_twi.c b/sim/bfin/dv-bfin_twi.c
index 00b080f122c..92d092f568e 100644
--- a/sim/bfin/dv-bfin_twi.c
+++ b/sim/bfin/dv-bfin_twi.c
@@ -88,7 +88,7 @@ bfin_twi_io_write_buffer (struct hw *me, const void *source, int space,
 
   value = dv_load_2 (source);
   mmr_off = addr - twi->base;
-  valuep = (void *)((unsigned long)twi + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)twi + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -142,7 +142,7 @@ bfin_twi_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - twi->base;
-  valuep = (void *)((unsigned long)twi + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)twi + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_uart.c b/sim/bfin/dv-bfin_uart.c
index 7aa843065b8..ada632efd6b 100644
--- a/sim/bfin/dv-bfin_uart.c
+++ b/sim/bfin/dv-bfin_uart.c
@@ -145,7 +145,7 @@ bfin_uart_io_write_buffer (struct hw *me, const void *source,
 
   value = dv_load_2 (source);
   mmr_off = addr - uart->base;
-  valuep = (void *)((unsigned long)uart + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)uart + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -268,7 +268,7 @@ bfin_uart_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - uart->base;
-  valuep = (void *)((unsigned long)uart + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)uart + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_uart2.c b/sim/bfin/dv-bfin_uart2.c
index a7985889f87..c3308384585 100644
--- a/sim/bfin/dv-bfin_uart2.c
+++ b/sim/bfin/dv-bfin_uart2.c
@@ -83,7 +83,7 @@ bfin_uart_io_write_buffer (struct hw *me, const void *source,
 
   value = dv_load_2 (source);
   mmr_off = addr - uart->base;
-  valuep = (void *)((unsigned long)uart + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)uart + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -140,7 +140,7 @@ bfin_uart_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - uart->base;
-  valuep = (void *)((unsigned long)uart + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)uart + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-bfin_wdog.c b/sim/bfin/dv-bfin_wdog.c
index 850ae0618df..e3172abc7bd 100644
--- a/sim/bfin/dv-bfin_wdog.c
+++ b/sim/bfin/dv-bfin_wdog.c
@@ -72,7 +72,7 @@ bfin_wdog_io_write_buffer (struct hw *me, const void *source,
     value = dv_load_2 (source);
 
   mmr_off = addr - wdog->base;
-  valuep = (void *)((unsigned long)wdog + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)wdog + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
@@ -121,7 +121,7 @@ bfin_wdog_io_read_buffer (struct hw *me, void *dest,
     return 0;
 
   mmr_off = addr - wdog->base;
-  valuep = (void *)((unsigned long)wdog + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)wdog + mmr_base() + mmr_off);
   value16p = valuep;
   value32p = valuep;
 
diff --git a/sim/bfin/dv-bfin_wp.c b/sim/bfin/dv-bfin_wp.c
index 189c121d97a..ac3b12ba925 100644
--- a/sim/bfin/dv-bfin_wp.c
+++ b/sim/bfin/dv-bfin_wp.c
@@ -84,7 +84,7 @@ bfin_wp_io_write_buffer (struct hw *me, const void *source, int space,
 
   value = dv_load_4 (source);
   mmr_off = addr - wp->base;
-  valuep = (void *)((unsigned long)wp + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)wp + mmr_base() + mmr_off);
 
   HW_TRACE_WRITE ();
 
@@ -124,7 +124,7 @@ bfin_wp_io_read_buffer (struct hw *me, void *dest, int space,
     return 0;
 
   mmr_off = addr - wp->base;
-  valuep = (void *)((unsigned long)wp + mmr_base() + mmr_off);
+  valuep = (void *)((uintptr_t)wp + mmr_base() + mmr_off);
 
   HW_TRACE_READ ();
 
diff --git a/sim/bfin/dv-eth_phy.c b/sim/bfin/dv-eth_phy.c
index 486054277c2..2f6749aa9fc 100644
--- a/sim/bfin/dv-eth_phy.c
+++ b/sim/bfin/dv-eth_phy.c
@@ -86,7 +86,7 @@ eth_phy_io_write_buffer (struct hw *me, const void *source,
   value = dv_load_2 (source);
 
   reg_off = addr - phy->base;
-  valuep = (void *)((unsigned long)phy + reg_base() + reg_off);
+  valuep = (void *)((uintptr_t)phy + reg_base() + reg_off);
 
   HW_TRACE_WRITE ();
 
@@ -117,7 +117,7 @@ eth_phy_io_read_buffer (struct hw *me, void *dest,
   bu16 *valuep;
 
   reg_off = addr - phy->base;
-  valuep = (void *)((unsigned long)phy + reg_base() + reg_off);
+  valuep = (void *)((uintptr_t)phy + reg_base() + reg_off);
 
   HW_TRACE_READ ();