Changeset 36125 in vbox for trunk/src/recompiler/tcg/i386

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)

Location:

trunk/src/recompiler/tcg/i386

Files:

• tcg-target.c (modified) (14 diffs)
• tcg-target.h (modified) (1 diff)

trunk/src/recompiler/tcg/i386/tcg-target.c

@@ -84 +84 @@
 
 /* maximum number of register used for input function arguments */
-#ifndef VBOX
 static inline int tcg_target_get_call_iarg_regs_count(int flags)
-#else /* VBOX */
-DECLINLINE(int) tcg_target_get_call_iarg_regs_count(int flags)
-#endif /* VBOX */
 {
     flags &= TCG_CALL_TYPE_MASK;
@@ -159 +155 @@
 
 /* test if a constant matches the constraint */
-#ifndef VBOX
 static inline int tcg_target_const_match(tcg_target_long val,
-#else /* VBOX */
-DECLINLINE(int) tcg_target_const_match(tcg_target_long val,
-#endif /* VBOX */
                                          const TCGArgConstraint *arg_ct)
 {
@@ -236 +228 @@
 #endif
 
-#ifndef VBOX
 static inline void tcg_out_opc(TCGContext *s, int opc)
-#else /* VBOX */
-DECLINLINE(void) tcg_out_opc(TCGContext *s, int opc)
-#endif /* VBOX */
 {
     if (opc & P_EXT)
@@ -247 +235 @@
 }
 
-#ifndef VBOX
 static inline void tcg_out_modrm(TCGContext *s, int opc, int r, int rm)
-#else /* VBOX */
-DECLINLINE(void) tcg_out_modrm(TCGContext *s, int opc, int r, int rm)
-#endif /* VBOX */
 {
     tcg_out_opc(s, opc);
@@ -258 +242 @@
 
 /* rm == -1 means no register index */
-#ifndef VBOX
 static inline void tcg_out_modrm_offset(TCGContext *s, int opc, int r, int rm,
-#else /* VBOX */
-DECLINLINE(void) tcg_out_modrm_offset(TCGContext *s, int opc, int r, int rm,
-#endif /* VBOX */
                                         int32_t offset)
 {
@@ -295 +275 @@
 }
 
-#ifndef VBOX
 static inline void tcg_out_mov(TCGContext *s, int ret, int arg)
-#else /* VBOX */
-DECLINLINE(void) tcg_out_mov(TCGContext *s, int ret, int arg)
-#endif /* VBOX */
 {
     if (arg != ret)
@@ -305 +281 @@
 }
 
-#ifndef VBOX
 static inline void tcg_out_movi(TCGContext *s, TCGType type,
-#else /* VBOX */
-DECLINLINE(void) tcg_out_movi(TCGContext *s, TCGType type,
-#endif /* VBOX */
                                 int ret, int32_t arg)
 {
@@ -321 +293 @@
 }
 
-#ifndef VBOX
 static inline void tcg_out_push(TCGContext *s, int reg)
-#else /* VBOX */
-DECLINLINE(void) tcg_out_push(TCGContext *s, int reg)
-#endif /* VBOX */
 {
     tcg_out_opc(s, 0x50 + reg);
 }
 
-#ifndef VBOX
 static inline void tcg_out_pop(TCGContext *s, int reg)
-#else /* VBOX */
-DECLINLINE(void) tcg_out_pop(TCGContext *s, int reg)
-#endif /* VBOX */
 {
     tcg_out_opc(s, 0x58 + reg);
 }
 
-#ifndef VBOX
 static inline void tcg_out_ld(TCGContext *s, TCGType type, int ret,
-#else /* VBOX */
-DECLINLINE(void) tcg_out_ld(TCGContext *s, TCGType type, int ret,
-#endif /* VBOX */
                               int arg1, tcg_target_long arg2)
 {
@@ -350 +310 @@
 }
 
-#ifndef VBOX
 static inline void tcg_out_st(TCGContext *s, TCGType type, int arg,
-#else /* VBOX */
-DECLINLINE(void) tcg_out_st(TCGContext *s, TCGType type, int arg,
-#endif /* VBOX */
                               int arg1, tcg_target_long arg2)
 {
@@ -361 +317 @@
 }
 
-#ifndef VBOX
 static inline void tgen_arithi(TCGContext *s, int c, int r0, int32_t val)
-#else /* VBOX */
-DECLINLINE(void) tgen_arithi(TCGContext *s, int c, int r0, int32_t val)
-#endif /* VBOX */
 {
     if (val == (int8_t)val) {
@@ -444 +396 @@
 
 #ifdef VBOX
-DECLINLINE(void)
-tcg_out_long_call(TCGContext *s, void* dst)
+
+DECLINLINE(void) tcg_out_long_call(TCGContext *s, void* dst)
 {
     intptr_t disp;
@@ -455 +407 @@
     tcg_out32(s, disp); /* disp32 */
 }
-DECLINLINE(void)
-tcg_out_long_jmp(TCGContext *s, void* dst)
+
+DECLINLINE(void) tcg_out_long_jmp(TCGContext *s, void* dst)
 {
     intptr_t disp = (uintptr_t)dst - (uintptr_t)s->code_ptr - 5;
@@ -462 +414 @@
     tcg_out32(s, disp); /* disp32 */
 }
+
 #endif /* VBOX */
-
 
 /* XXX: we implement it at the target level to avoid having to
@@ -1126 +1078 @@
 }
 
-#ifndef VBOX
 static inline void tcg_out_op(TCGContext *s, int opc,
-#else /* VBOX */
-DECLINLINE(void) tcg_out_op(TCGContext *s, int opc,
-#endif /* VBOX */
                               const TCGArg *args, const int *const_args)
 {

trunk/src/recompiler/tcg/i386/tcg-target.h

@@ -57 +57 @@
 #endif
 
-#ifndef VBOX
 static inline void flush_icache_range(unsigned long start, unsigned long stop)
-#else
-DECLINLINE(void) flush_icache_range(unsigned long start, unsigned long stop)
-#endif
 {
 }