Changeset 106736 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-x-regs.c32

Timestamp:

Oct 28, 2024 8:11:30 AM (3 months ago)

Author:

vboxsync

Message:

ValidationKit/bootsectors: some cleanup; bugref:9898; bugref:10658; jiraref:VBP-1206

• update bs3-cpu-instr-3 worker #6 to use new SetReg scheme
• replace misnamed _NORM_SAFE_INT_MIN with equivalent _NORM_MIN values
• add BS3_REGISTER_IS_MEMREF(), BS3_REGISTER_MEMREF_TO() macros

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-x-regs.c32 (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-x-regs.c32

@@ -381 +381 @@
 #define          BS3_REGISTER_FLAG_MEMREF        0x100
 #define          BS3_FSxREG(reg)                 (((reg) == FSxBX || (reg) == FSxDI) ? reg : ((reg) & BS3_REGISTER_REGISTER_MASK) | BS3_REGISTER_FLAG_MEMREF)
+#define          BS3_REGISTER_IS_MEMREF(reg)     (((reg) & BS3_REGISTER_FLAG_MEMREF) || (((reg) & BS3_REGISTER_FAMILY_MEMREF) == BS3_REGISTER_FAMILY_MEMREF))
+#define          BS3_REGISTER_MEMREF_TO(reg)     (((reg) == FSxBX ? BX : (reg) == FSxDI ? DI : (reg)) & BS3_REGISTER_REGISTER_MASK)
 
 #define BS3_REGISTER_NAME_MAXSIZE sizeof("FSx(avail)")
@@ -482 +484 @@
     char        pszRegName[BS3_REGISTER_NAME_MAXSIZE];
 
-    if (uReg & BS3_REGISTER_FLAG_MEMREF || uReg == FSxBX || uReg == FSxDI)
+    if (BS3_REGISTER_IS_MEMREF(uReg))
     {
-        if (uRegSet <= BS3_REGISTER_FAMILY_64BIT)
-            uRegNum &= BS3_REGISTER_REGISTER_MASK;
-        else if (uReg == FSxBX)
-            uRegNum = BX;
-        else if (uReg == FSxDI)
-            uRegNum = DI;
+        if (uReg == FSxBX || uReg == FSxDI || uRegSet <= BS3_REGISTER_FAMILY_64BIT)
+            uRegNum = BS3_REGISTER_MEMREF_TO(uReg);
         else
             uRegNum = 255; /* Fall through to error handling below to complain about 'FSxZMM31' or whatever */