From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id A5C253858C3A for ; Mon, 1 Nov 2021 03:45:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A5C253858C3A Received: by smtp.gentoo.org (Postfix, from userid 559) id 34433342D70; Mon, 1 Nov 2021 03:45:18 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: mn10300: clean up pointer casts Date: Sun, 31 Oct 2021 23:45:19 -0400 Message-Id: <20211101034519.29154-1-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2021 03:45:20 -0000 The void *data field is used to past arbitrary data between event handlers, and these are using it to pass an enum. Fix up the casts to avoid using (long) to cast to/from pointers since there is no guarantee that's the right size. --- sim/mn10300/dv-mn103ser.c | 6 +++--- sim/mn10300/dv-mn103tim.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sim/mn10300/dv-mn103ser.c b/sim/mn10300/dv-mn103ser.c index 3465954f75f7..d2140e22c196 100644 --- a/sim/mn10300/dv-mn103ser.c +++ b/sim/mn10300/dv-mn103ser.c @@ -238,7 +238,7 @@ do_polling_event (struct hw *me, { SIM_DESC sd = hw_system (me); struct mn103ser *serial = hw_data(me); - long serial_reg = (long) data; + long serial_reg = (uintptr_t) data; char c; int count, status; @@ -280,7 +280,7 @@ do_polling_event (struct hw *me, /* Schedule next polling event */ serial->device[serial_reg].event = hw_event_queue_schedule (me, 1000, - do_polling_event, (void *)serial_reg); + do_polling_event, (void *)(uintptr_t)serial_reg); } @@ -424,7 +424,7 @@ read_status_reg (struct hw *me, serial->device[serial_reg].event = hw_event_queue_schedule (me, 1000, do_polling_event, - (void *) (long) serial_reg); + (void *)(uintptr_t)serial_reg); } if ( nr_bytes == 1 ) diff --git a/sim/mn10300/dv-mn103tim.c b/sim/mn10300/dv-mn103tim.c index ad9c24bbc6e8..76f87380d1d8 100644 --- a/sim/mn10300/dv-mn103tim.c +++ b/sim/mn10300/dv-mn103tim.c @@ -570,7 +570,7 @@ do_counter_event (struct hw *me, void *data) { struct mn103tim *timers = hw_data(me); - long timer_nr = (long) data; + long timer_nr = (uintptr_t) data; int next_timer; /* Check if counting is still enabled. */ @@ -596,7 +596,7 @@ do_counter_event (struct hw *me, /* FIX: Check if div_ratio has changed and if it's now 0. */ timers->timer[timer_nr].event = hw_event_queue_schedule (me, timers->timer[timer_nr].div_ratio, - do_counter_event, (void *)timer_nr); + do_counter_event, (void *)(uintptr_t)timer_nr); } else { @@ -611,7 +611,7 @@ do_counter6_event (struct hw *me, void *data) { struct mn103tim *timers = hw_data(me); - long timer_nr = (long) data; + long timer_nr = (uintptr_t) data; int next_timer; /* Check if counting is still enabled. */ @@ -625,7 +625,7 @@ do_counter6_event (struct hw *me, /* FIX: Check if div_ratio has changed and if it's now 0. */ timers->timer[timer_nr].event = hw_event_queue_schedule (me, timers->timer[timer_nr].div_ratio, - do_counter6_event, (void *)timer_nr); + do_counter6_event, (void *)(uintptr_t)timer_nr); } else { @@ -808,7 +808,7 @@ write_mode_reg (struct hw *me, timers->timer[timer_nr].event = hw_event_queue_schedule(me, div_ratio, do_counter_event, - (void *)(timer_nr)); + (void *)(uintptr_t)timer_nr); } } } @@ -908,7 +908,7 @@ write_tm6md (struct hw *me, timers->timer[timer_nr].event = hw_event_queue_schedule(me, div_ratio, do_counter6_event, - (void *)(timer_nr)); + (void *)(uintptr_t)timer_nr); } } else -- 2.33.0