vbox的更動 13232 路徑 trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp

時間撮記:

2008-10-13 下午08:03:48 (16 年 以前)

作者:

vboxsync

訊息:

#1865: changed some validation into pure assertions or assert-return. added some todos, update a comment or five and adjusted lots of whitespace.

檔案:

• trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp (修改) (3 筆差異)

trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp

@@ -55 +55 @@
     AssertMsg(cbPages > 0 && RT_ALIGN_32(cbPages, PAGE_SIZE) == cbPages, ("Invalid cbPages=%#x\n",  cbPages));
     AssertMsg(!(fFlags & X86_PDE_PG_MASK), ("Invalid flags %#x\n", fFlags));
-    //Assert(HCPhys < _4G); ---  Don't *EVER* try 32-bit shadow mode on a PAE/AMD64 box with memory above 4G !!!
 
     /* hypervisor defaults */
@@ -148 +147 @@
      * Validate input.
      */
-    if (fFlags & X86_PTE_PAE_PG_MASK)
-    {
-        AssertMsgFailed(("fFlags=%#x\n", fFlags));
-        return VERR_INVALID_PARAMETER;
-    }
-    if (!cb)
-    {
-        AssertFailed();
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertMsg(!(fFlags & X86_PTE_PAE_PG_MASK), ("fFlags=%#x\n", fFlags));
+    Assert(cb);
 
     /*
@@ -175 +166 @@
         if (off < pCur->cb)
         {
-            if (off + cb > pCur->cb)
-            {
-                AssertMsgFailed(("Invalid page range %#x LB%#x. mapping '%s' %#x to %#x\n",
-                                 GCPtr, cb, pCur->pszDesc, pCur->GCPtr, pCur->GCPtrLast));
-                return VERR_INVALID_PARAMETER;
-            }
+            AssertMsgReturn(off + cb <= pCur->cb,
+                            ("Invalid page range %#x LB%#x. mapping '%s' %#x to %#x\n",
+                             GCPtr, cb, pCur->pszDesc, pCur->GCPtr, pCur->GCPtrLast),
+                            VERR_INVALID_PARAMETER);
 
             /*