Changeset 36125 in vbox for trunk/src/recompiler/exec.c

Timestamp:

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

Author:

vboxsync

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

70290

Message:

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

File:

• trunk/src/recompiler/exec.c (modified) (18 diffs)

trunk/src/recompiler/exec.c

@@ -358 +358 @@
 }
 
-#ifndef VBOX
 static inline PageDesc **page_l1_map(target_ulong index)
-#else
-DECLINLINE(PageDesc **) page_l1_map(target_ulong index)
-#endif
 {
 #ifndef VBOX
@@ -392 +388 @@
 }
 
-#ifndef VBOX
 static inline PageDesc *page_find_alloc(target_ulong index)
-#else
-DECLINLINE(PageDesc *) page_find_alloc(target_ulong index)
-#endif
 {
     PageDesc **lp, *p;
@@ -427 +419 @@
 }
 
-#ifndef VBOX
 static inline PageDesc *page_find(target_ulong index)
-#else
-DECLINLINE(PageDesc *) page_find(target_ulong index)
-#endif
 {
     PageDesc **lp, *p;
@@ -497 +485 @@
 }
 
-#ifndef VBOX
 static inline PhysPageDesc *phys_page_find(target_phys_addr_t index)
-#else
-DECLINLINE(PhysPageDesc *) phys_page_find(target_phys_addr_t index)
-#endif
 {
     return phys_page_find_alloc(index, 0);
@@ -716 +700 @@
 }
 
-#ifndef VBOX
 static inline void invalidate_page_bitmap(PageDesc *p)
-#else
-DECLINLINE(void) invalidate_page_bitmap(PageDesc *p)
-#endif
 {
     if (p->code_bitmap) {
@@ -852 +832 @@
 
 /* invalidate one TB */
-#ifndef VBOX
 static inline void tb_remove(TranslationBlock **ptb, TranslationBlock *tb,
                              int next_offset)
-#else
-DECLINLINE(void) tb_remove(TranslationBlock **ptb, TranslationBlock *tb,
-                           int next_offset)
-#endif
 {
     TranslationBlock *tb1;
@@ -871 +846 @@
 }
 
-#ifndef VBOX
 static inline void tb_page_remove(TranslationBlock **ptb, TranslationBlock *tb)
-#else
-DECLINLINE(void) tb_page_remove(TranslationBlock **ptb, TranslationBlock *tb)
-#endif
 {
     TranslationBlock *tb1;
@@ -892 +863 @@
 }
 
-#ifndef VBOX
 static inline void tb_jmp_remove(TranslationBlock *tb, int n)
-#else
-DECLINLINE(void) tb_jmp_remove(TranslationBlock *tb, int n)
-#endif
 {
     TranslationBlock *tb1, **ptb;
@@ -926 +893 @@
 /* reset the jump entry 'n' of a TB so that it is not chained to
    another TB */
-#ifndef VBOX
 static inline void tb_reset_jump(TranslationBlock *tb, int n)
-#else
-DECLINLINE(void) tb_reset_jump(TranslationBlock *tb, int n)
-#endif
 {
     tb_set_jmp_target(tb, n, (unsigned long)(tb->tc_ptr + tb->tb_next_offset[n]));
@@ -1037 +1000 @@
 #endif /* VBOX */
 
-#ifndef VBOX
 static inline void set_bits(uint8_t *tab, int start, int len)
-#else
-DECLINLINE(void) set_bits(uint8_t *tab, int start, int len)
-#endif
 {
     int end, mask, end1;
@@ -1254 +1213 @@
 
 /* len must be <= 8 and start must be a multiple of len */
-#ifndef VBOX
 static inline void tb_invalidate_phys_page_fast(target_phys_addr_t start, int len)
-#else
-DECLINLINE(void) tb_invalidate_phys_page_fast(target_phys_addr_t start, int len)
-#endif
 {
     PageDesc *p;
@@ -1356 +1311 @@
 
 /* add the tb in the target page and protect it if necessary */
-#ifndef VBOX
 static inline void tb_alloc_page(TranslationBlock *tb,
                                  unsigned int n, target_ulong page_addr)
-#else
-DECLINLINE(void) tb_alloc_page(TranslationBlock *tb,
-                                 unsigned int n, target_ulong page_addr)
-#endif
 {
     PageDesc *p;
@@ -1518 +1468 @@
 static void tb_reset_jump_recursive(TranslationBlock *tb);
 
-#ifndef VBOX
 static inline void tb_reset_jump_recursive2(TranslationBlock *tb, int n)
-#else
-DECLINLINE(void) tb_reset_jump_recursive2(TranslationBlock *tb, int n)
-#endif
 {
     TranslationBlock *tb1, *tb_next, **ptb;
@@ -1899 +1845 @@
 #if !defined(CONFIG_USER_ONLY)
 
-#ifndef VBOX
 static inline void tlb_flush_jmp_cache(CPUState *env, target_ulong addr)
-#else
-DECLINLINE(void) tlb_flush_jmp_cache(CPUState *env, target_ulong addr)
-#endif
 {
     unsigned int i;
@@ -1964 +1906 @@
 }
 
-#ifndef VBOX
 static inline void tlb_flush_entry(CPUTLBEntry *tlb_entry, target_ulong addr)
-#else
-DECLINLINE(void) tlb_flush_entry(CPUTLBEntry *tlb_entry, target_ulong addr)
-#endif
 {
     if (addr == (tlb_entry->addr_read &
@@ -2037 +1975 @@
 }
 
-#ifndef VBOX
 static inline void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry,
                                          unsigned long start, unsigned long length)
-#else
-DECLINLINE(void) tlb_reset_dirty_range(CPUTLBEntry *tlb_entry,
-                                       unsigned long start, unsigned long length)
-#endif
 {
     unsigned long addr;
@@ -2190 +2123 @@
 }
 
-#ifndef VBOX
 static inline void tlb_set_dirty1(CPUTLBEntry *tlb_entry, target_ulong vaddr)
-#else
-DECLINLINE(void) tlb_set_dirty1(CPUTLBEntry *tlb_entry, target_ulong vaddr)
-#endif
 {
     if (tlb_entry->addr_write == (vaddr | TLB_NOTDIRTY))
@@ -2203 +2132 @@
 /* update the TLB corresponding to virtual page vaddr and phys addr
    addr so that it is no longer dirty */
-#ifndef VBOX
 static inline void tlb_set_dirty(CPUState *env,
                                  unsigned long addr, target_ulong vaddr)
-#else
-DECLINLINE(void) tlb_set_dirty(CPUState *env,
-                               unsigned long addr, target_ulong vaddr)
-#endif
 {
     int i;