Changeset 13382 in vbox for trunk/src/recompiler_new/target-i386/cpu.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/target-i386/cpu.h (modified) (6 diffs)

trunk/src/recompiler_new/target-i386/cpu.h

@@ -569 +569 @@
     union {
 #ifdef USE_X86LDOUBLE
+#ifndef VBOX
         CPU86_LDouble d __attribute__((aligned(16)));
+#else
+        ALIGNED_MEMBER(CPU86_LDouble, d, 16); 
+#endif
 #else
         CPU86_LDouble d;
@@ -729 +733 @@
     union {
 #ifdef USE_X86LDOUBLE
+#ifndef VBOX
         CPU86_LDouble d __attribute__((aligned(16)));
+#else
+        ALIGNED_MEMBER(CPU86_LDouble, d, 16);
+#endif
 #else
         CPU86_LDouble d;
@@ -805 +813 @@
 /* this function must always be used to load data in the segment
    cache: it synchronizes the hflags with the segment cache values */
+#ifndef VBOX
 static inline void cpu_x86_load_seg_cache(CPUX86State *env, 
                                           int seg_reg, unsigned int selector,
@@ -810 +819 @@
                                           unsigned int limit, 
                                           unsigned int flags)
+#else
+DECLINLINE(void)  cpu_x86_load_seg_cache(CPUX86State *env, 
+                                          int seg_reg, unsigned int selector,
+                                          target_ulong base,
+                                          unsigned int limit, 
+                                          unsigned int flags)
+
+#endif
 {
     SegmentCache *sc;
@@ -866 +883 @@
 
 /* wrapper, just in case memory mappings must be changed */
+#ifndef VBOX
 static inline void cpu_x86_set_cpl(CPUX86State *s, int cpl)
+#else
+DECLINLINE(void) cpu_x86_set_cpl(CPUX86State *s, int cpl)
+#endif
 {
 #if HF_CPL_MASK == 3
@@ -956 +977 @@
 #define MMU_MODE1_SUFFIX _user
 #define MMU_USER_IDX 1
+#ifndef VBOX
 static inline int cpu_mmu_index (CPUState *env)
+#else
+DECLINLINE(int) cpu_mmu_index (CPUState *env)
+#endif
 {
     return (env->hflags & HF_CPL_MASK) == 3 ? 1 : 0;