Changeset 17035 in vbox for trunk/src/recompiler_new/target-i386

Timestamp:

Feb 23, 2009 10:26:39 PM (16 years ago)

Author:

vboxsync

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

43248

Message:

VMM,REM: Brushed up the TR/TSS shadowing. We're now relying on the hidden TR registers in SELM and CPUM/REM will make sure these are always in sync. Joined CPUMGetGuestTRHid and CPUMGetGuestTR. Kicked out sync_tr (unused now) and SELMGCGetRing1Stack.

Location:

trunk/src/recompiler_new/target-i386

Files:

• helper.h (modified) (4 diffs)
• op_helper.c (modified) (1 diff)

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

@@ -43 +43 @@
 DEF_HELPER(void, helper_lcall_real, (int new_cs, target_ulong new_eip1,
                        int shift, int next_eip))
-DEF_HELPER(void, helper_lcall_protected, (int new_cs, target_ulong new_eip, 
+DEF_HELPER(void, helper_lcall_protected, (int new_cs, target_ulong new_eip,
                             int shift, int next_eip_addend))
 DEF_HELPER(void, helper_iret_real, (int shift))
@@ -114 +114 @@
 DEF_HELPER(void, helper_svm_check_intercept_param, (uint32_t type, uint64_t param))
 DEF_HELPER(void, helper_vmexit, (uint32_t exit_code, uint64_t exit_info_1))
-DEF_HELPER(void, helper_svm_check_io, (uint32_t port, uint32_t param, 
+DEF_HELPER(void, helper_svm_check_io, (uint32_t port, uint32_t param,
                          uint32_t next_eip_addend))
 DEF_HELPER(void, helper_vmrun, (int aflag, int next_eip_addend))
@@ -134 +134 @@
 DEF_HELPER(void, helper_fildl_ST0, (int32_t val))
 DEF_HELPER(void, helper_fildll_ST0, (int64_t val))
-#ifndef VBOX 
+#ifndef VBOX
 DEF_HELPER(uint32_t, helper_fsts_ST0, (void))
 DEF_HELPER(uint64_t, helper_fstl_ST0, (void))
@@ -257 +257 @@
 void sync_seg(CPUX86State *env1, int seg_reg, int selector);
 void sync_ldtr(CPUX86State *env1, int selector);
-int  sync_tr(CPUX86State *env1, int selector);
 
 #endif

trunk/src/recompiler_new/target-i386/op_helper.c

@@ -5861 +5861 @@
 }
 
-/**
- * Correctly loads a new tr selector.
- *
- * @param   env1        CPU environment.
- * @param   selector    Selector to load.
- */
-int sync_tr(CPUX86State *env1, int selector)
-{
-    /* ARG! this was going to call helper_ltr_T0 but that won't work because of busy flag. */
-    SegmentCache *dt;
-    uint32_t e1, e2;
-    int index, type, entry_limit;
-    target_ulong ptr;
-    CPUX86State *saved_env = env;
-    env = env1;
-
-    selector &= 0xffff;
-    if ((selector & 0xfffc) == 0) {
-        /* NULL selector case: invalid TR */
-        env->tr.base = 0;
-        env->tr.limit = 0;
-        env->tr.flags = 0;
-    } else {
-        if (selector & 0x4)
-            goto l_failure;
-        dt = &env->gdt;
-        index = selector & ~7;
-#ifdef TARGET_X86_64
-        if (env->hflags & HF_LMA_MASK)
-            entry_limit = 15;
-        else
-#endif
-            entry_limit = 7;
-        if ((index + entry_limit) > dt->limit)
-            goto l_failure;
-        ptr = dt->base + index;
-        e1 = ldl_kernel(ptr);
-        e2 = ldl_kernel(ptr + 4);
-        type = (e2 >> DESC_TYPE_SHIFT) & 0xf;
-        if ((e2 & DESC_S_MASK) /*||
-            (type != 1 && type != 9)*/)
-            goto l_failure;
-        if (!(e2 & DESC_P_MASK))
-            goto l_failure;
-#ifdef TARGET_X86_64
-        if (env->hflags & HF_LMA_MASK) {
-            uint32_t e3;
-            e3 = ldl_kernel(ptr + 8);
-            load_seg_cache_raw_dt(&env->tr, e1, e2);
-            env->tr.base |= (target_ulong)e3 << 32;
-        } else
-#endif
-        {
-            load_seg_cache_raw_dt(&env->tr, e1, e2);
-        }
-        e2 |= DESC_TSS_BUSY_MASK;
-        stl_kernel(ptr + 4, e2);
-    }
-    env->tr.selector = selector;
-
-    env = saved_env;
-    return 0;
-l_failure:
-    AssertMsgFailed(("selector=%d\n", selector));
-    return -1;
-}
-
-
 int get_ss_esp_from_tss_raw(CPUX86State *env1, uint32_t *ss_ptr,
                              uint32_t *esp_ptr, int dpl)