Changeset 36125 in vbox for trunk/src/recompiler/exec-all.h

Timestamp:

Mar 1, 2011 4:49:42 PM (14 years ago)

Author:

vboxsync

Message:

recompiler: Removing traces of attempts at making the recompiler compile with the microsoft compiler. (untested)

File:

• trunk/src/recompiler/exec-all.h (modified) (8 diffs)

trunk/src/recompiler/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)
@@ -193 +187 @@
 };
 
-#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;
@@ -204 +194 @@
 }
 
-#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;
@@ -217 +202 @@
 }
 
-#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);
@@ -281 +262 @@
 
 /* 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;
@@ -294 +270 @@
 #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 */
@@ -384 +355 @@
 /* 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 *env1, target_ulong addr)
-#else
-DECLINLINE(target_ulong) get_phys_addr_code(CPUState *env1, target_ulong addr)
-#endif
 {
     int mmu_idx, page_index, pd;
@@ -425 +392 @@
 /* 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)