Changeset 100859 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 11, 2023 11:43:38 AM (18 months ago)

Author:

vboxsync

Message:

VMM/IEM: Stack MC rework preps. bugref:10369

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllThrdPython.py (modified) (4 diffs)
• include/IEMMc.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllThrdPython.py

@@ -521 +521 @@
         'IEM_MC_STORE_MEM_U256':                  (  0, 'IEM_MC_STORE_MEM_FLAT_U256' ),
         'IEM_MC_STORE_MEM_U256_ALIGN_AVX':        (  0, 'IEM_MC_STORE_MEM_FLAT_U256_ALIGN_AVX' ),
-        'IEM_MC_PUSH_U16':                        ( -1, 'IEM_MC_FLAT_PUSH_U16' ),
-        'IEM_MC_PUSH_U32':                        ( -1, 'IEM_MC_FLAT_PUSH_U32' ),
-        'IEM_MC_PUSH_U32_SREG':                   ( -1, 'IEM_MC_FLAT_PUSH_U32_SREG' ),
-        'IEM_MC_PUSH_U64':                        ( -1, 'IEM_MC_FLAT_PUSH_U64' ),
-        'IEM_MC_POP_U16':                         ( -1, 'IEM_MC_FLAT_POP_U16' ),
-        'IEM_MC_POP_U32':                         ( -1, 'IEM_MC_FLAT_POP_U32' ),
-        'IEM_MC_POP_U64':                         ( -1, 'IEM_MC_FLAT_POP_U64' ),
-        'IEM_MC_POP_EX_U16':                      ( -1, 'IEM_MC_FLAT_POP_EX_U16' ),
-        'IEM_MC_POP_EX_U32':                      ( -1, 'IEM_MC_FLAT_POP_EX_U32' ),
-        'IEM_MC_POP_EX_U64':                      ( -1, 'IEM_MC_FLAT_POP_EX_U64' ),
         'IEM_MC_MEM_MAP':                         (  2, 'IEM_MC_MEM_FLAT_MAP' ),
         'IEM_MC_MEM_MAP_U8_RW':                   (  2, 'IEM_MC_MEM_FLAT_MAP_U8_RW' ),
@@ -548 +538 @@
 
     kdMemMcToFlatInfoStack = {
-        'IEM_MC_PUSH_U16':                        (  'IEM_MC_PUSH_FLAT32_U16', 'IEM_MC_PUSH_FLAT64_U16', ),
-        'IEM_MC_PUSH_U32':                        (  'IEM_MC_PUSH_FLAT32_U32', 'IEM_MC_PUSH_FLAT64_U32', ),
-        'IEM_MC_PUSH_U64':                        (  'IEM_MC_PUSH_U64',        'IEM_MC_PUSH_FLAT64_U64', ),
-        'IEM_MC_POP_U16':                         (  'IEM_MC_POP_FLAT32_U16',  'IEM_MC_POP_FLAT64_U16', ),
-        'IEM_MC_POP_U32':                         (  'IEM_MC_POP_FLAT32_U32',  'IEM_MC_POP_FLAT64_U32', ),
-        'IEM_MC_POP_U64':                         (  'IEM_MC_POP_U64',         'IEM_MC_POP_FLAT64_U64', ),
+        'IEM_MC_PUSH_U16':                        (  'IEM_MC_FLAT32_PUSH_U16',      'IEM_MC_FLAT64_PUSH_U16', ),
+        'IEM_MC_PUSH_U32':                        (  'IEM_MC_FLAT32_PUSH_U32',      'IEM_MC_PUSH_U32', ),
+        'IEM_MC_PUSH_U64':                        (  'IEM_MC_PUSH_U64',             'IEM_MC_FLAT64_PUSH_U64', ),
+        'IEM_MC_PUSH_U32_SREG':                   (  'IEM_MC_FLAT32_PUSH_U32_SREG', 'IEM_MC_PUSH_U32_SREG' ),
+        'IEM_MC_POP_U16':                         (  'IEM_MC_FLAT32_POP_U16',       'IEM_MC_FLAT64_POP_U16', ),
+        'IEM_MC_POP_U32':                         (  'IEM_MC_FLAT32_POP_U32',       'IEM_MC_POP_U32', ),
+        'IEM_MC_POP_U64':                         (  'IEM_MC_POP_U64',              'IEM_MC_FLAT64_POP_U64', ),
     };
 
@@ -656 +647 @@
                       and (   oNewStmt.sName.startswith('IEM_MC_FETCH_MEM')
                            or (oNewStmt.sName.startswith('IEM_MC_STORE_MEM_') and oNewStmt.sName.find('_BY_REF') < 0)
-                           or oNewStmt.sName.startswith('IEM_MC_MEM_MAP')
-                           or (oNewStmt.sName.startswith('IEM_MC_PUSH') and oNewStmt.sName.find('_FPU') < 0)
-                           or oNewStmt.sName.startswith('IEM_MC_POP') )):
+                           or oNewStmt.sName.startswith('IEM_MC_MEM_MAP') )):
                     idxEffSeg = self.kdMemMcToFlatInfo[oNewStmt.sName][0];
                     if idxEffSeg != -1:
@@ -667 +656 @@
                         oNewStmt.asParams.pop(idxEffSeg);
                     oNewStmt.sName = self.kdMemMcToFlatInfo[oNewStmt.sName][1];
+
+                # ... PUSH and POP also needs flat variants, but these differ a little.
+                elif (    self.sVariation in (self.ksVariation_64, self.ksVariation_32_Flat,)
+                      and (   (oNewStmt.sName.startswith('IEM_MC_PUSH') and oNewStmt.sName.find('_FPU') < 0)
+                           or oNewStmt.sName.startswith('IEM_MC_POP'))):
+                    oNewStmt.sName = self.kdMemMcToFlatInfoStack[oNewStmt.sName][int(self.sVariation == self.ksVariation_64)];
+
 
                 # Process branches of conditionals recursively.

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

@@ -1285 +1285 @@
 
 /* Regular stack push and pop: */
-#define IEM_MC_PUSH_U16(a_u16Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU16(pVCpu, (a_u16Value)))
-#define IEM_MC_PUSH_U32(a_u32Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU32(pVCpu, (a_u32Value)))
-#define IEM_MC_PUSH_U32_SREG(a_u32Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU32SReg(pVCpu, (a_u32Value)))
-#define IEM_MC_PUSH_U64(a_u64Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU64(pVCpu, (a_u64Value)))
-
-#define IEM_MC_POP_U16(a_pu16Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU16(pVCpu, (a_pu16Value)))
-#define IEM_MC_POP_U32(a_pu32Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU32(pVCpu, (a_pu32Value)))
-#define IEM_MC_POP_U64(a_pu64Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU64(pVCpu, (a_pu64Value)))
-
-#define IEM_MC_POP_EX_U16(a_pu16Value, a_) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU16Ex(pVCpu, (a_pu16Value), (a_pNewRsp)))
-#define IEM_MC_POP_EX_U32(a_pu32Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU32(pVCpu, (a_pu32Value)))
-#define IEM_MC_POP_EX_U64(a_pu64Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU64(pVCpu, (a_pu64Value)))
-
-/* Flat stack push and pop: */
-#define IEM_MC_FLAT_PUSH_U16(a_u16Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU16(pVCpu, (a_u16Value)))
-#define IEM_MC_FLAT_PUSH_U32(a_u32Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU32(pVCpu, (a_u32Value)))
-#define IEM_MC_FLAT_PUSH_U32_SREG(a_u32Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU32SReg(pVCpu, (a_u32Value)))
-#define IEM_MC_FLAT_PUSH_U64(a_u64Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU64(pVCpu, (a_u64Value)))
-
-#define IEM_MC_FLAT_POP_U16(a_pu16Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU16(pVCpu, (a_pu16Value)))
-#define IEM_MC_FLAT_POP_U32(a_pu32Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU32(pVCpu, (a_pu32Value)))
-#define IEM_MC_FLAT_POP_U64(a_pu64Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU64(pVCpu, (a_pu64Value)))
-
-#define IEM_MC_FLAT_POP_EX_U16(a_pu16Value, a_) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU16Ex(pVCpu, (a_pu16Value), (a_pNewRsp)))
-#define IEM_MC_FLAT_POP_EX_U32(a_pu32Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU32(pVCpu, (a_pu32Value)))
-#define IEM_MC_FLAT_POP_EX_U64(a_pu64Value) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU64(pVCpu, (a_pu64Value)))
+#define IEM_MC_PUSH_U16(a_u16Value)             IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU16(pVCpu, (a_u16Value)))
+#define IEM_MC_PUSH_U32(a_u32Value)             IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU32(pVCpu, (a_u32Value)))
+#define IEM_MC_PUSH_U32_SREG(a_u32Value)        IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU32SReg(pVCpu, (a_u32Value)))
+#define IEM_MC_PUSH_U64(a_u64Value)             IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU64(pVCpu, (a_u64Value)))
+
+#define IEM_MC_POP_U16(a_pu16Value)             IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU16(pVCpu, (a_pu16Value)))
+#define IEM_MC_POP_U32(a_pu32Value)             IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU32(pVCpu, (a_pu32Value)))
+#define IEM_MC_POP_U64(a_pu64Value)             IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU64(pVCpu, (a_pu64Value)))
+
+/* 32-bit flat stack push and pop: */
+#define IEM_MC_FLAT32_PUSH_U16(a_u16Value)      IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU16(pVCpu, (a_u16Value)))
+#define IEM_MC_FLAT32_PUSH_U32(a_u32Value)      IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU32(pVCpu, (a_u32Value)))
+#define IEM_MC_FLAT32_PUSH_U32_SREG(a_u32Value) IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU32SReg(pVCpu, (a_u32Value)))
+
+#define IEM_MC_FLAT32_POP_U16(a_pu16Value)      IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU16(pVCpu, (a_pu16Value)))
+#define IEM_MC_FLAT32_POP_U32(a_pu32Value)      IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU32(pVCpu, (a_pu32Value)))
+
+/* 64-bit flat stack push and pop: */
+#define IEM_MC_FLAT64_PUSH_U16(a_u16Value)      IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU16(pVCpu, (a_u16Value)))
+#define IEM_MC_FLAT64_PUSH_U64(a_u64Value)      IEM_MC_RETURN_ON_FAILURE(iemMemStackPushU64(pVCpu, (a_u64Value)))
+
+#define IEM_MC_FLAT64_POP_U16(a_pu16Value)      IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU16(pVCpu, (a_pu16Value)))
+#define IEM_MC_FLAT64_POP_U64(a_pu64Value)      IEM_MC_RETURN_ON_FAILURE(iemMemStackPopU64(pVCpu, (a_pu64Value)))