Changeset 37675 in vbox for trunk/src/recompiler/qemu-common.h

Timestamp:

Jun 29, 2011 7:07:14 AM (13 years ago)

Author:

vboxsync

Message:

rem: Synced with v0.12.5.

File:

• trunk/src/recompiler/qemu-common.h (modified) (12 diffs)

trunk/src/recompiler/qemu-common.h

@@ -3 +3 @@
 #define QEMU_COMMON_H
 
+#include "config-host.h"
+
 #ifdef VBOX
 
-# include <string.h>
-# include <inttypes.h>
+# include <iprt/string.h>
+# include <iprt/types.h>
 # include <iprt/ctype.h>
-
-#define QEMU_NORETURN __attribute__ ((__noreturn__))
 
 void pstrcpy(char *buf, int buf_size, const char *str);
 char *pstrcat(char *buf, int buf_size, const char *s);
-# define snprintf RTStrPrintf
-
-#define qemu_isalnum(c)         RT_C_IS_ALNUM((unsigned char)(c))
-#define qemu_isalpha(c)         RT_C_IS_ALPHA((unsigned char)(c))
-#define qemu_iscntrl(c)         RT_C_IS_CNTRL((unsigned char)(c))
-#define qemu_isdigit(c)         RT_C_IS_DIGIT((unsigned char)(c))
-#define qemu_isgraph(c)         RT_C_IS_GRAPH((unsigned char)(c))
-#define qemu_islower(c)         RT_C_IS_LOWER((unsigned char)(c))
-#define qemu_isprint(c)         RT_C_IS_PRINT((unsigned char)(c))
-#define qemu_ispunct(c)         RT_C_IS_PUNCT((unsigned char)(c))
-#define qemu_isspace(c)         RT_C_IS_SPACE((unsigned char)(c))
-#define qemu_isupper(c)         RT_C_IS_UPPER((unsigned char)(c))
-#define qemu_isxdigit(c)        RT_C_IS_XDIGIT((unsigned char)(c))
-#define qemu_tolower(c)         RT_C_TO_LOWER((unsigned char)(c))
-#define qemu_toupper(c)         RT_C_TO_UPPER((unsigned char)(c))
-#define qemu_isascii(c)         RT_C_IS_ASCII((unsigned char)(c))
-#define qemu_toascii(c)         RT_C_TO_ASCII((unsigned char)(c))
-
-#define qemu_init_vcpu(env)     do { } while (0) /* we don't need this :-) */
-
+# define snprintf               RTStrPrintf
+
+# define qemu_isalnum(c)        RT_C_IS_ALNUM((unsigned char)(c))
+# define qemu_isalpha(c)        RT_C_IS_ALPHA((unsigned char)(c))
+# define qemu_iscntrl(c)        RT_C_IS_CNTRL((unsigned char)(c))
+# define qemu_isdigit(c)        RT_C_IS_DIGIT((unsigned char)(c))
+# define qemu_isgraph(c)        RT_C_IS_GRAPH((unsigned char)(c))
+# define qemu_islower(c)        RT_C_IS_LOWER((unsigned char)(c))
+# define qemu_isprint(c)        RT_C_IS_PRINT((unsigned char)(c))
+# define qemu_ispunct(c)        RT_C_IS_PUNCT((unsigned char)(c))
+# define qemu_isspace(c)        RT_C_IS_SPACE((unsigned char)(c))
+# define qemu_isupper(c)        RT_C_IS_UPPER((unsigned char)(c))
+# define qemu_isxdigit(c)       RT_C_IS_XDIGIT((unsigned char)(c))
+# define qemu_tolower(c)        RT_C_TO_LOWER((unsigned char)(c))
+# define qemu_toupper(c)        RT_C_TO_UPPER((unsigned char)(c))
+# define qemu_isascii(c)        RT_C_IS_ASCII((unsigned char)(c))
+# define qemu_toascii(c)        RT_C_TO_ASCII((unsigned char)(c))
+
+# define qemu_init_vcpu(env)    do { } while (0) /* we don't need this :-) */
+
+# define QEMU_NORETURN              __attribute__((__noreturn__))
+# ifdef CONFIG_GCC_ATTRIBUTE_WARN_UNUSED_RESULT
+#  define QEMU_WARN_UNUSED_RESULT   __attribute__((warn_unused_result))
+# else
+#  define QEMU_WARN_UNUSED_RESULT
+# endif
 
 #else /* !VBOX */
@@ -63 +69 @@
 #include <sys/stat.h>
 #include <assert.h>
-#include "config-host.h"
 
 #ifndef O_LARGEFILE
@@ -71 +76 @@
 #define O_BINARY 0
 #endif
-
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
 #ifndef ENOMEDIUM
 #define ENOMEDIUM ENODEV
 #endif
-
-#ifndef HAVE_IOVEC
-#define HAVE_IOVEC
+#if !defined(ENOTSUP)
+#define ENOTSUP 4096
+#endif
+
+#ifndef CONFIG_IOVEC
+#define CONFIG_IOVEC
 struct iovec {
     void *iov_base;
     size_t iov_len;
 };
+/*
+ * Use the same value as Linux for now.
+ */
+#define IOV_MAX         1024
 #else
 #include <sys/uio.h>
@@ -89 +103 @@
 #define fsync _commit
 #define lseek _lseeki64
-#define ENOTSUP 4096
 extern int qemu_ftruncate64(int, int64_t);
 #define ftruncate qemu_ftruncate64
-
 
 static inline char *realpath(const char *path, char *resolved_path)
@@ -123 +135 @@
 
 typedef void QEMUBHFunc(void *opaque);
+
+void async_context_push(void);
+void async_context_pop(void);
+int get_async_context_id(void);
 
 QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque);
@@ -136 +152 @@
 void qemu_bh_delete(QEMUBH *bh);
 int qemu_bh_poll(void);
+void qemu_bh_update_timeout(int *timeout);
 
 uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c);
@@ -150 +167 @@
 time_t mktimegm(struct tm *tm);
 int qemu_fls(int i);
+int qemu_fdatasync(int fd);
+
+/* path.c */
+void init_paths(const char *prefix);
+const char *path(const char *pathname);
 
 #define qemu_isalnum(c)         isalnum((unsigned char)(c))
@@ -177 +199 @@
 
 
+void qemu_mutex_lock_iothread(void);
+void qemu_mutex_unlock_iothread(void);
+
+int qemu_open(const char *name, int flags, ...);
+void qemu_set_cloexec(int fd);
+
+#ifndef _WIN32
+int qemu_pipe(int pipefd[2]);
+#endif
+
 /* Error handling.  */
 
@@ -208 +240 @@
 typedef TextConsole QEMUConsole;
 typedef struct CharDriverState CharDriverState;
+typedef struct MACAddr MACAddr;
 typedef struct VLANState VLANState;
+typedef struct VLANClientState VLANClientState;
 typedef struct QEMUFile QEMUFile;
 typedef struct i2c_bus i2c_bus;
@@ -214 +248 @@
 typedef struct SMBusDevice SMBusDevice;
 typedef struct QEMUTimer QEMUTimer;
+typedef struct PCIHostState PCIHostState;
+typedef struct PCIExpressHost PCIExpressHost;
 typedef struct PCIBus PCIBus;
 typedef struct PCIDevice PCIDevice;
@@ -255 +291 @@
 void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov);
 void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len);
+void qemu_iovec_concat(QEMUIOVector *dst, QEMUIOVector *src, size_t size);
 void qemu_iovec_destroy(QEMUIOVector *qiov);
 void qemu_iovec_reset(QEMUIOVector *qiov);
@@ -263 +300 @@
 typedef struct Monitor Monitor;
 
+/* Convert a byte between binary and BCD.  */
+static inline uint8_t to_bcd(uint8_t val)
+{
+    return ((val / 10) << 4) | (val % 10);
+}
+
+static inline uint8_t from_bcd(uint8_t val)
+{
+    return ((val >> 4) * 10) + (val & 0x0f);
+}
+
 #include "module.h"