← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtualbox/quantal

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMAll/EMAll.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-05-29 10:09:31 UTC
  • mfrom: (3.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20120529100931-2xayrbh5hyzm6e9p
Tags: 4.1.16-dfsg-1
* New upstream release.
* Drop 37-fix-build-gcc47.patch, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMAll/EMAll.cpp
183
183
    {
184
184
        if (PAGE_ADDRESS(InstrGC) == PAGE_ADDRESS(InstrGC + sizeof(State.aOpcode) - 1))
185
185
        {
186
 
           if (rc == VERR_PAGE_TABLE_NOT_PRESENT)
187
 
              HWACCMInvalidatePage(pVCpu, InstrGC);
 
186
            /*
 
187
             * If we fail to find the page via the guest's page tables we invalidate the page
 
188
             * in the host TLB (pertaining to the guest in the NestedPaging case). See #6043
 
189
             */
 
190
            if (rc == VERR_PAGE_TABLE_NOT_PRESENT || rc == VERR_PAGE_NOT_PRESENT)
 
191
                HWACCMInvalidatePage(pVCpu, InstrGC);
188
192
 
189
193
           Log(("emDisCoreOne: read failed with %d\n", rc));
190
194
           return rc;
272
276
    {
273
277
        if (PAGE_ADDRESS(GCPtrInstr) == PAGE_ADDRESS(GCPtrInstr + sizeof(State.aOpcode) - 1))
274
278
        {
275
 
           if (rc == VERR_PAGE_TABLE_NOT_PRESENT)
276
 
              HWACCMInvalidatePage(pVCpu, GCPtrInstr);
 
279
            /*
 
280
             * If we fail to find the page via the guest's page tables we invalidate the page
 
281
             * in the host TLB (pertaining to the guest in the NestedPaging case). See #6043
 
282
             */
 
283
            if (rc == VERR_PAGE_TABLE_NOT_PRESENT || rc == VERR_PAGE_NOT_PRESENT)
 
284
                HWACCMInvalidatePage(pVCpu, GCPtrInstr);
277
285
 
278
286
           Log(("EMInterpretDisasOneEx: read failed with %d\n", rc));
279
287
           return rc;