From 00330cd18a4ba83beabad4cb9f4215170828cd29 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 24 Apr 2021 14:35:14 -0400 Subject: sim: callback: convert time interface to 64-bit PR sim/27705 Rather than rely on time_t being the right size between the host & target, have the interface always be 64-bit. We can figure out if we need to truncate when actually outputting it to the right target. --- sim/arm/ChangeLog | 4 ++++ sim/arm/armos.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'sim/arm') diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 7124a6d0a32..5282e70a81a 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,7 @@ +2021-05-14 Mike Frysinger + + * armos.c (ARMul_OSHandleSWI): Delete 2nd arg to time callback. + 2021-05-14 Mike Frysinger * armos.c: Update include path. diff --git a/sim/arm/armos.c b/sim/arm/armos.c index 77b256fd5b3..72bdf599718 100644 --- a/sim/arm/armos.c +++ b/sim/arm/armos.c @@ -437,7 +437,7 @@ ARMul_OSHandleSWI (ARMul_State * state, ARMword number) case SWI_Time: if (swi_mask & SWI_MASK_DEMON) { - state->Reg[0] = (ARMword) sim_callback->time (sim_callback, NULL); + state->Reg[0] = (ARMword) sim_callback->time (sim_callback); OSptr->ErrorNo = sim_callback->get_errno (sim_callback); } else @@ -592,7 +592,7 @@ ARMul_OSHandleSWI (ARMul_State * state, ARMword number) break; case AngelSWI_Reason_Time: - state->Reg[0] = (ARMword) sim_callback->time (sim_callback, NULL); + state->Reg[0] = (ARMword) sim_callback->time (sim_callback); OSptr->ErrorNo = sim_callback->get_errno (sim_callback); break; @@ -781,7 +781,7 @@ ARMul_OSHandleSWI (ARMul_State * state, ARMword number) break; case 17: /* Utime. */ - state->Reg[0] = state->Reg[1] = (ARMword) sim_callback->time (sim_callback, NULL); + state->Reg[0] = state->Reg[1] = (ARMword) sim_callback->time (sim_callback); OSptr->ErrorNo = sim_callback->get_errno (sim_callback); break; -- cgit v1.2.1