Changeset 105794 in vbox for trunk/src/VBox

Timestamp:

Aug 21, 2024 6:42:10 PM (7 months ago)

Author:

vboxsync

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

164506

Message:

Disassembler/ARMv8: Build fixes, our ancient compilers on the 32-bit buildboxes doing syntax check don't like unnamed unions..., bugref:10394

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore-armv8.cpp (modified) (3 diffs)
• DisasmFormatArmV8.cpp (modified) (2 diffs)

trunk/src/VBox/Disassembler/DisasmCore-armv8.cpp

@@ -292 +292 @@
     {
         pParam->armv8.enmShift = kDisArmv8OpParmShiftLeft;
-        pParam->armv8.cShift   = ((uint8_t)u32 & 0x3) << 4;
+        pParam->armv8.u.cShift = ((uint8_t)u32 & 0x3) << 4;
     }
     return VINF_SUCCESS;
@@ -414 +414 @@
     Assert(pParam->armv8.enmShift != kDisArmv8OpParmShiftNone);
     Assert(u32Amount < 64);
-    pParam->armv8.cShift = (uint8_t)u32Amount;
+    pParam->armv8.u.cShift = (uint8_t)u32Amount;
     /* Any shift operation with a 0 is essentially no shift being applied. */
-    if (pParam->armv8.cShift == 0)
+    if (pParam->armv8.u.cShift == 0)
         pParam->armv8.enmShift = kDisArmv8OpParmShiftNone;
     return VINF_SUCCESS;
@@ -429 +429 @@
 
     uint8_t const uScale = *pf64Bit ? 8 : 4;
-    pParam->armv8.offBase = disArmV8ExtractBitVecFromInsn(u32Insn, pInsnParm->idxBitStart, pInsnParm->cBits) * uScale;
+    pParam->armv8.u.offBase = disArmV8ExtractBitVecFromInsn(u32Insn, pInsnParm->idxBitStart, pInsnParm->cBits) * uScale;
     pParam->armv8.cb = sizeof(uint16_t);
     return VINF_SUCCESS;

trunk/src/VBox/Disassembler/DisasmFormatArmV8.cpp

@@ -721 +721 @@
                     PUT_STR(pszReg, cchReg);
 
-                    if (pParam->armv8.offBase)
+                    if (pParam->armv8.u.offBase)
                     {
                         PUT_SZ(", #");
-                        PUT_NUM_16(pParam->armv8.offBase);
+                        PUT_NUM_16(pParam->armv8.u.offBase);
                     }
 
@@ -756 +756 @@
                         AssertFailed();
                 }
-                PUT_NUM_8(pParam->armv8.cShift);
+                PUT_NUM_8(pParam->armv8.u.cShift);
             }
         }