Changeset 54714 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Mar 11, 2015 2:00:23 PM (10 years ago)

Author:

vboxsync

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

98878

Message:

PATM,CPUM: CPUID patch update.

Location:

trunk/src/VBox/VMM/include

Files:

• PATMA.h (modified) (4 diffs)
• PATMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/include/PATMA.h

@@ -20 +20 @@
 
 /** @name Patch Fixup Types
+ * @remarks These fixups types are part of the saved state.
  * @{ */
 #define PATM_VMFLAGS                            0xF1ABCD00
@@ -34 +35 @@
 #define PATM_FIXUP                              0xF1ABCD07
 #define PATM_PENDINGACTION                      0xF1ABCD08
-#define PATM_CPUID_STD_PTR                      0xF1ABCD09
-#define PATM_CPUID_EXT_PTR                      0xF1ABCD0a
+#define PATM_CPUID_STD_PTR                      0xF1ABCD09  /**< Legacy, saved state only. */
+#define PATM_CPUID_EXT_PTR                      0xF1ABCD0a  /**< Legacy, saved state only. */
 #define PATM_CPUID_DEF_PTR                      0xF1ABCD0b
 #define PATM_STACKBASE                          0xF1ABCD0c  /**< Stack to store our private patch return addresses */
@@ -51 +52 @@
 #define PATM_CALL_PATCH_TARGET_ADDR             0xF1ABCD18
 #define PATM_CALL_RETURN_ADDR                   0xF1ABCD19
-#define PATM_CPUID_CENTAUR_PTR                  0xF1ABCD1a
+#define PATM_CPUID_CENTAUR_PTR                  0xF1ABCD1a  /**< Legacy, saved state only. */
+#define PATM_CPUID_ARRAY_PTR                    0xF1ABCD1b
+#define PATM_CPUID_ARRAY_END_PTR                0xF1ABCD1c
+#define PATM_CPUID_ARRAY_ENTRY_SIZE             0xF1ABCD1d
+#define PATM_CPUID_UNKNOWN_METHOD               0xF1ABCD1e
 
 /* Anything larger doesn't require a fixup */
@@ -67 +72 @@
 #define PATM_IRET_FUNCTION                      0xF1ABCE0A  /**< Relative address of global PATM iret function. */
 #define PATM_CPUID_CENTAUR_MAX                  0xF1ABCE0B
+
+/** Identifies an patch fixup type value (with reasonable accuracy). */
+#define PATM_IS_FIXUP_TYPE(a_uValue) \
+    ( ((a_uValue) & UINT32_C(0xfffffC00)) == UINT32_C(0xF1ABCC00) && ((a_uValue) & UINT32_C(0xff)) < UINT32_C(0x30) )
 /** @} */
 

trunk/src/VBox/VMM/include/PATMInternal.h

@@ -32 +32 @@
 /** @name Saved state version numbers.
  * @{ */
+/** New fixup type FIXUP_ABSOLUTE_IN_PATCH_ASM_TMPL. */
+#define PATM_SAVED_STATE_VERSION                    57
 /** Uses normal structure serialization with markers and everything. */
-#define PATM_SAVED_STATE_VERSION                    56
+#define PATM_SAVED_STATE_VERSION_NO_RAW_MEM         56
 /** Last version which saves structures as raw memory. */
 #define PATM_SAVED_STATE_VERSION_MEM                55
@@ -98 +100 @@
 #define PATM_MAX_INVALID_WRITES            16384
 
+/** @name FIXUP_XXX - RELOCREC::uType values.
+ * @{ */
+/** Absolute fixup.  With one exception (MMIO cache), this does not take any
+ * source or destination.  @sa FIXUP_ABSOLUTE_ASM.  */
 #define FIXUP_ABSOLUTE                     0
 #define FIXUP_REL_JMPTOPATCH               1
 #define FIXUP_REL_JMPTOGUEST               2
+/** Absolute fixup in patch assembly code template.
+ *
+ * The source and desination addresses both set to the patch fixup type (see
+ * PATM_IS_FIXUP_TYPE and friends in PATMA.h).  This is recent addition (CPUID
+ * subleaf code), so when loading older saved states this is usally represented
+ * as FIXUP_ABSOLUTE. */
+#define FIXUP_ABSOLUTE_IN_PATCH_ASM_TMPL   3
+/** @} */
+
 
 #define PATM_ILLEGAL_DESTINATION           0xDEADBEEF