gdb: throw OPTIMIZED_OUT_ERROR rather than GENERIC_ERROR

[binutils-gdb.git] / sim / bfin / dv-bfin_uart.c

diff --git a/sim/bfin/dv-bfin_uart.c b/sim/bfin/dv-bfin_uart.c
index 0692119ee986c4d684964a88931f4b13cad6ad4b..ada632efd6b782df987628505be4d9fd0a384e73 100644 (file)
--- a/sim/bfin/dv-bfin_uart.c
+++ b/sim/bfin/dv-bfin_uart.c
@@ -1,7 +1,7 @@
 /* Blackfin Universal Asynchronous Receiver/Transmitter (UART) model.
    For "old style" UARTs on BF53x/etc... parts.
 
-   Copyright (C) 2010-2016 Free Software Foundation, Inc.
+   Copyright (C) 2010-2021 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -19,7 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "config.h"
+/* This must come before any other includes.  */
+#include "defs.h"
 
 #include "sim-main.h"
 #include "dv-sockser.h"
@@ -144,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 ();
 
@@ -267,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 ();