Move qemu_gettimeofday() to OS specific files (dc786bc9) · Commits · SUMMER2020 / students / proj-2021291

m68k-semi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,10 +33,10 @@
		#define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024)
		#else
		#include "qemu-common.h"
		#include "sysemu.h"
		#include "gdbstub.h"
		#include "softmmu-semi.h"
		#endif
		#include "sysemu.h"

		#define HOSTED_EXIT 0
		#define HOSTED_INIT_SIM 1

+0 −31

Original line number	Diff line number	Diff line
		@@ -111,37 +111,6 @@ int qemu_create_pidfile(const char *filename)
		return 0;
		}

		#ifdef _WIN32

		/* mingw32 needs ffs for compilations without optimization. */
		int ffs(int i)
		{
		/* Use gcc's builtin ffs. */
		return __builtin_ffs(i);
		}

		/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
		#define _W32_FT_OFFSET (116444736000000000ULL)

		int qemu_gettimeofday(qemu_timeval *tp)
		{
		union {
		unsigned long long ns100; /time since 1 Jan 1601 in 100ns units /
		FILETIME ft;
		} _now;

		if(tp)
		{
		GetSystemTimeAsFileTime (&_now.ft);
		tp->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL );
		tp->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
		}
		/* Always return 0 as per Open Group Base Specifications Issue 6.
		Do not set errno on error. */
		return 0;
		}
		#endif /* _WIN32 */


		/*
		* Opens a file with FD_CLOEXEC set

+0 −15

Original line number	Diff line number	Diff line
		@@ -127,19 +127,4 @@ int qemu_madvise(void *addr, size_t len, int advice);

		int qemu_create_pidfile(const char *filename);

		#ifdef _WIN32
		int ffs(int i);

		int setenv(const char name, const char value, int overwrite);

		typedef struct {
		long tv_sec;
		long tv_usec;
		} qemu_timeval;
		int qemu_gettimeofday(qemu_timeval *tp);
		#else
		typedef struct timeval qemu_timeval;
		#define qemu_gettimeofday(tp) gettimeofday(tp, NULL);
		#endif /* !_WIN32 */

		#endif

+27 −0

Original line number	Diff line number	Diff line
		@@ -92,3 +92,30 @@ int inet_aton(const char cp, struct in_addr ia)
		void qemu_set_cloexec(int fd)
		{
		}

		/* mingw32 needs ffs for compilations without optimization. */
		int ffs(int i)
		{
		/* Use gcc's builtin ffs. */
		return __builtin_ffs(i);
		}

		/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
		#define _W32_FT_OFFSET (116444736000000000ULL)

		int qemu_gettimeofday(qemu_timeval *tp)
		{
		union {
		unsigned long long ns100; /time since 1 Jan 1601 in 100ns units /
		FILETIME ft;
		} _now;

		if(tp) {
		GetSystemTimeAsFileTime (&_now.ft);
		tp->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL );
		tp->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
		}
		/* Always return 0 as per Open Group Base Specifications Issue 6.
		Do not set errno on error. */
		return 0;
		}

+1 −0