Changeset 13382 in vbox for trunk/src/recompiler_new/exec-all.h

Timestamp:

Oct 19, 2008 8:45:30 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

38111

Message:

more MSVC-related stuff

File:

• trunk/src/recompiler_new/exec-all.h (modified) (9 diffs)

trunk/src/recompiler_new/exec-all.h

@@ -112 +112 @@
                       target_phys_addr_t paddr, int prot,
                       int mmu_idx, int is_softmmu);
+#ifndef VBOX
 static inline int tlb_set_page(CPUState *env1, target_ulong vaddr,
                                target_phys_addr_t paddr, int prot,
                                int mmu_idx, int is_softmmu)
+#else
+DECLINLINE(int) tlb_set_page(CPUState *env1, target_ulong vaddr,
+                               target_phys_addr_t paddr, int prot,
+                               int mmu_idx, int is_softmmu)
+#endif
 {
     if (prot & PAGE_READ)
@@ -190 +196 @@
 };
 
+#ifndef VBOX
 static inline unsigned int tb_jmp_cache_hash_page(target_ulong pc)
+#else
+DECLINLINE(unsigned int) tb_jmp_cache_hash_page(target_ulong pc)
+#endif
 {
     target_ulong tmp;
@@ -197 +207 @@
 }
 
+#ifndef VBOX
 static inline unsigned int tb_jmp_cache_hash_func(target_ulong pc)
+#else
+DECLINLINE(unsigned int) tb_jmp_cache_hash_func(target_ulong pc)
+#endif
+
 {
     target_ulong tmp;
@@ -205 +220 @@
 }
 
+#ifndef VBOX
 static inline unsigned int tb_phys_hash_func(unsigned long pc)
+#else
+DECLINLINE(unsigned int) tb_phys_hash_func(unsigned long pc)
+#endif
 {
     return pc & (CODE_GEN_PHYS_HASH_SIZE - 1);
@@ -265 +284 @@
 
 /* set the jump target */
+#ifndef VBOX
 static inline void tb_set_jmp_target(TranslationBlock *tb,
                                      int n, unsigned long addr)
+#else
+DECLINLINE(void) tb_set_jmp_target(TranslationBlock *tb,
+                                   int n, unsigned long addr)
+#endif
 {
     tb->tb_next[n] = addr;
@@ -273 +297 @@
 #endif
 
+#ifndef VBOX
 static inline void tb_add_jump(TranslationBlock *tb, int n,
                                TranslationBlock *tb_next)
+#else
+DECLINLINE(void) tb_add_jump(TranslationBlock *tb, int n,
+                             TranslationBlock *tb_next)
+#endif
 {
     /* NOTE: this test is only needed for thread safety */
@@ -361 +390 @@
 /* NOTE2: the returned address is not exactly the physical address: it
    is the offset relative to phys_ram_base */
+#ifndef VBOX
 static inline target_ulong get_phys_addr_code(CPUState *env, target_ulong addr)
+#else
+DECLINLINE(target_ulong) get_phys_addr_code(CPUState *env, target_ulong addr)
+#endif
 {
     int is_user, index, pd;
@@ -381 +414 @@
 #error unimplemented CPU
 #endif
+#ifndef VBOX
     if (__builtin_expect(env->tlb_table[is_user][index].addr_code !=
                          (addr & TARGET_PAGE_MASK), 0)) {
+#else
+    if (RT_UNLIKELY(env->tlb_table[is_user][index].addr_code !=
+                         (addr & TARGET_PAGE_MASK))) {
+#endif
         ldub_code(addr);
     }
@@ -406 +444 @@
 /* Deterministic execution requires that IO only be performed on the last
    instruction of a TB so that interrupts take effect immediately.  */
+#ifndef VBOX
 static inline int can_do_io(CPUState *env)
+#else
+DECLINLINE(int) can_do_io(CPUState *env)
+#endif
 {
     if (!use_icount)