From 388a1e989b9fa3d404ebda9bf007e093d61c77b8 Mon Sep 17 00:00:00 2001 From: ghizard <50744617+ghizard@users.noreply.github.com> Date: Tue, 22 Apr 2025 17:09:36 -0400 Subject: [PATCH] GP-5608 - PDB CPP Fix vxtable composition regression; add in planned signature compare; adjust tests --- .../pdb/pdbapplicator/CppCompositeType.java | 18 +- .../app/util/pdb/Cfb432ProgramCreator.java | 122 +++++------ .../app/util/pdb/Cfb464ProgramCreator.java | 122 +++++------ .../app/util/pdb/Egray832ProgramCreator.java | 8 +- .../app/util/pdb/Egray864ProgramCreator.java | 8 +- .../app/util/pdb/Vftm32ProgramCreator.java | 198 +++++++++--------- .../app/util/pdb/Vftm64ProgramCreator.java | 198 +++++++++--------- 7 files changed, 341 insertions(+), 333 deletions(-) diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java index 96d14020c7..977f5d60f0 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java @@ -1054,10 +1054,6 @@ public class CppCompositeType { mainVft = getMainVft(vxtManager); if (mainVft != null) { updateMainVft(); - for (VXT t : finalVftByOffset.values()) { - VirtualFunctionTable vft = (VirtualFunctionTable) t; - updateVftFromSelf(vft); - } } if (getNumLayoutVirtualBaseClasses() == 0) { if (!DefaultCompositeMember.applyDataTypeMembers(composite, false, false, size, @@ -1098,6 +1094,12 @@ public class CppCompositeType { clearComponents(composite); } } + + for (VXT t : finalVftByOffset.values()) { + VirtualFunctionTable vft = (VirtualFunctionTable) t; + updateVftFromSelf(vft); + } + } // Taken from PdbUtil without change. Would have had to change access on class PdbUtil and @@ -1682,10 +1684,16 @@ public class CppCompositeType { SymbolPath origPath = e.getOriginalPath(); SymbolPath methodPath = e.getOverridePath(); String methodName = methodPath.getName(); + Pointer p = e.getFunctionPointer(); + FunctionDefinition tableFunctionDefinition = (FunctionDefinition) p.getDataType(); for (VirtualFunctionInfo vfInfo : virtualFunctionInfo) { SymbolPath selfMethodPath = vfInfo.name(); String selfMethodName = selfMethodPath.getName(); - if (selfMethodName.equals(methodName)) { + FunctionDefinition selfFunctionDefinition = vfInfo.definition(); + if (!selfMethodName.equals(methodName)) { + continue; + } + if (selfFunctionDefinition.isEquivalent(tableFunctionDefinition)) { // potential overridden method; just replace path (could be the same) methodPath = selfMethodPath; break; diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Cfb432ProgramCreator.java b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Cfb432ProgramCreator.java index 2cfafc925a..cb7a318961 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Cfb432ProgramCreator.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Cfb432ProgramCreator.java @@ -1165,7 +1165,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ANS/A/!internal/VTABLE_0000000c pack() Structure VTABLE_0000000c { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 ANS::A::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -1181,7 +1181,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ANS/A/!internal/VTABLE_00000014 pack() Structure VTABLE_00000014 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 ANS::A::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -1496,7 +1496,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /BNS/B/!internal/VTABLE_0000000c pack() Structure VTABLE_0000000c { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb1_1 "" 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } @@ -1512,7 +1512,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /BNS/B/!internal/VTABLE_00000014 pack() Structure VTABLE_00000014 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -1738,7 +1738,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { pack() Structure VTABLE_0000000c { 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" - 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" + 4 _func___thiscall_int * 4 CNS::C::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } Length: 12 Alignment: 4"""; @@ -1753,7 +1753,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /CNS/C/!internal/VTABLE_00000014 pack() Structure VTABLE_00000014 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 CNS::C::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -1770,7 +1770,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { pack() Structure VTABLE_0000001c { 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" - 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" + 4 _func___thiscall_int * 4 CNS::C::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } Length: 12 Alignment: 4"""; @@ -1785,7 +1785,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /CNS/C/!internal/VTABLE_00000024 pack() Structure VTABLE_00000024 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 CNS::C::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -2154,8 +2154,8 @@ public class Cfb432ProgramCreator extends ProgramCreator { /DNS/D/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" - 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" + 0 _func___thiscall_int * 4 ANS::A::fa1_1 "" + 4 _func___thiscall_int * 4 CNS::C::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } Length: 12 Alignment: 4"""; @@ -2170,7 +2170,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /DNS/D/!internal/VTABLE_00000030 pack() Structure VTABLE_00000030 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 DNS::D::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -2186,8 +2186,8 @@ public class Cfb432ProgramCreator extends ProgramCreator { /DNS/D/!internal/VTABLE_00000038 pack() Structure VTABLE_00000038 { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" - 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" + 0 _func___thiscall_int * 4 BNS::B::fb1_1 "" + 4 _func___thiscall_int * 4 CNS::C::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } Length: 12 Alignment: 4"""; @@ -2202,7 +2202,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /DNS/D/!internal/VTABLE_00000040 pack() Structure VTABLE_00000040 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 DNS::D::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -2470,7 +2470,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ENS/E/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 ENS::E::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -2486,7 +2486,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ENS/E/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 ANS::A::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -2502,7 +2502,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ENS/E/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb1_1 "" 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } @@ -2518,7 +2518,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ENS/E/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -2675,7 +2675,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /FNS/F/!internal/VTABLE_00000008 pack() Structure VTABLE_00000008 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 FNS::F::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -2820,7 +2820,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /GNS/G/!internal/VTABLE_0000000c pack() Structure VTABLE_0000000c { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 GNS::G::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -2965,7 +2965,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /HNS/H/!internal/VTABLE_0000000c pack() Structure VTABLE_0000000c { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 HNS::H::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -3170,7 +3170,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /INS/I/!internal/VTABLE_0000001c pack() Structure VTABLE_0000001c { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 INS::I::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -3298,7 +3298,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /JNS/J/!internal/VTABLE_00000008 pack() Structure VTABLE_00000008 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 JNS::J::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -3443,7 +3443,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /KNS/K/!internal/VTABLE_0000000c pack() Structure VTABLE_0000000c { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 KNS::K::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -3605,7 +3605,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /LNS/L/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 LNS::L::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -4669,7 +4669,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000068 pack() Structure VTABLE_00000068 { - 0 _func___thiscall_int * 4 N1NS::N1::fn1_1 "" + 0 _func___thiscall_int * 4 MNS::M::fn1_1 "" 4 _func___thiscall_int * 4 N1NS::N1::fn1_2 "" } Length: 8 Alignment: 4"""; @@ -4684,8 +4684,8 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000070 pack() Structure VTABLE_00000070 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" - 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" + 0 _func___thiscall_int * 4 MNS::M::fa1_1 "" + 4 _func___thiscall_int * 4 CNS::C::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } Length: 12 Alignment: 4"""; @@ -4700,7 +4700,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000078 pack() Structure VTABLE_00000078 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 MNS::M::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -4716,8 +4716,8 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000080 pack() Structure VTABLE_00000080 { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" - 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" + 0 _func___thiscall_int * 4 MNS::M::fb1_1 "" + 4 _func___thiscall_int * 4 CNS::C::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } Length: 12 Alignment: 4"""; @@ -4732,7 +4732,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000088 pack() Structure VTABLE_00000088 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 MNS::M::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -4792,8 +4792,8 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000068 pack() Structure VTABLE_00000068 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" - 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" + 0 _func___thiscall_int * 4 MNS::M::fa1_1 "" + 4 _func___thiscall_int * 4 CNS::C::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } Length: 12 Alignment: 4"""; @@ -4808,7 +4808,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000070 pack() Structure VTABLE_00000070 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 MNS::M::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -4824,8 +4824,8 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000078 pack() Structure VTABLE_00000078 { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" - 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" + 0 _func___thiscall_int * 4 MNS::M::fb1_1 "" + 4 _func___thiscall_int * 4 CNS::C::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } Length: 12 Alignment: 4"""; @@ -4840,7 +4840,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000080 pack() Structure VTABLE_00000080 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 MNS::M::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -4885,7 +4885,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000094 pack() Structure VTABLE_00000094 { - 0 _func___thiscall_int * 4 N1NS::N1::fn1_1 "" + 0 _func___thiscall_int * 4 MNS::M::fn1_1 "" 4 _func___thiscall_int * 4 N1NS::N1::fn1_2 "" } Length: 8 Alignment: 4"""; @@ -5205,7 +5205,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O1NS/O1/!internal/VTABLE_0000001c pack() Structure VTABLE_0000001c { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 ANS::A::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -5221,7 +5221,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O1NS/O1/!internal/VTABLE_00000024 pack() Structure VTABLE_00000024 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 O1NS::O1::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -5237,7 +5237,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O1NS/O1/!internal/VTABLE_0000002c pack() Structure VTABLE_0000002c { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb1_1 "" 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } @@ -5253,7 +5253,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O1NS/O1/!internal/VTABLE_00000034 pack() Structure VTABLE_00000034 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -5524,7 +5524,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O2NS/O2/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 ANS::A::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -5540,7 +5540,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O2NS/O2/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 O2NS::O2::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -5556,7 +5556,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O2NS/O2/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb1_1 "" 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } @@ -5572,7 +5572,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O2NS/O2/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -5907,7 +5907,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O3NS/O3/!internal/VTABLE_0000001c pack() Structure VTABLE_0000001c { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 ANS::A::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -5923,7 +5923,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O3NS/O3/!internal/VTABLE_00000024 pack() Structure VTABLE_00000024 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 O3NS::O3::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -5939,7 +5939,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O3NS/O3/!internal/VTABLE_0000002c pack() Structure VTABLE_0000002c { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb1_1 "" 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } @@ -5955,7 +5955,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O3NS/O3/!internal/VTABLE_00000034 pack() Structure VTABLE_00000034 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -6226,7 +6226,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O4NS/O4/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 ANS::A::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -6242,7 +6242,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O4NS/O4/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 O4NS::O4::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -6258,7 +6258,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O4NS/O4/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb1_1 "" 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } @@ -6274,7 +6274,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /O4NS/O4/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 BNS::B::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -6845,7 +6845,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ONS/O/!internal/VTABLE_00000030 pack() Structure VTABLE_00000030 { - 0 _func___thiscall_int * 4 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 4 ONS::O::fa1_1 "" 4 _func___thiscall_int * 4 A1NS::A1::fa1_2 "" 8 _func___thiscall_int * 4 A1NS::A1::fa1_3 "" } @@ -6861,7 +6861,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ONS/O/!internal/VTABLE_00000038 pack() Structure VTABLE_00000038 { - 0 _func___thiscall_int * 4 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 4 ONS::O::fa2_1 "" 4 _func___thiscall_int * 4 A2NS::A2::fa2_2 "" 8 _func___thiscall_int * 4 A2NS::A2::fa2_3 "" } @@ -6877,7 +6877,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ONS/O/!internal/VTABLE_00000040 pack() Structure VTABLE_00000040 { - 0 _func___thiscall_int * 4 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 4 ONS::O::fb1_1 "" 4 _func___thiscall_int * 4 B1NS::B1::fb1_2 "" 8 _func___thiscall_int * 4 B1NS::B1::fb1_3 "" } @@ -6893,7 +6893,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { /ONS/O/!internal/VTABLE_00000048 pack() Structure VTABLE_00000048 { - 0 _func___thiscall_int * 4 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 4 ONS::O::fb2_1 "" 4 _func___thiscall_int * 4 B2NS::B2::fb2_2 "" 8 _func___thiscall_int * 4 B2NS::B2::fb2_3 "" } @@ -6939,7 +6939,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { pack() Structure VTABLE_0000005c { 0 _func___thiscall_int * 4 ANS::A::fa_1 "" - 4 _func___thiscall_int * 4 O3NS::O3::fo3_1 "" + 4 _func___thiscall_int * 4 ONS::O::fo3_1 "" } Length: 8 Alignment: 4"""; //@formatter:on @@ -7000,7 +7000,7 @@ public class Cfb432ProgramCreator extends ProgramCreator { pack() Structure VTABLE_00000078 { 0 _func___thiscall_int * 4 ANS::A::fa_1 "" - 4 _func___thiscall_int * 4 O4NS::O4::fo4_1 "" + 4 _func___thiscall_int * 4 ONS::O::fo4_1 "" } Length: 8 Alignment: 4"""; //@formatter:on diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Cfb464ProgramCreator.java b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Cfb464ProgramCreator.java index 7e67bbfddf..8c5c8fb02f 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Cfb464ProgramCreator.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Cfb464ProgramCreator.java @@ -1204,7 +1204,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ANS/A/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 ANS::A::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -1220,7 +1220,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ANS/A/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 ANS::A::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -1540,7 +1540,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /BNS/B/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb1_1 "" 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } @@ -1556,7 +1556,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /BNS/B/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -1787,7 +1787,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { pack() Structure VTABLE_00000018 { 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" - 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" + 8 _func___thiscall_int * 8 CNS::C::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } Length: 24 Alignment: 8"""; @@ -1802,7 +1802,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /CNS/C/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 CNS::C::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -1819,7 +1819,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { pack() Structure VTABLE_00000038 { 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" - 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" + 8 _func___thiscall_int * 8 CNS::C::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } Length: 24 Alignment: 8"""; @@ -1834,7 +1834,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /CNS/C/!internal/VTABLE_00000048 pack() Structure VTABLE_00000048 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 CNS::C::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -2211,8 +2211,8 @@ public class Cfb464ProgramCreator extends ProgramCreator { /DNS/D/!internal/VTABLE_00000050 pack() Structure VTABLE_00000050 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" - 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" + 0 _func___thiscall_int * 8 ANS::A::fa1_1 "" + 8 _func___thiscall_int * 8 CNS::C::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } Length: 24 Alignment: 8"""; @@ -2227,7 +2227,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /DNS/D/!internal/VTABLE_00000060 pack() Structure VTABLE_00000060 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 DNS::D::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -2243,8 +2243,8 @@ public class Cfb464ProgramCreator extends ProgramCreator { /DNS/D/!internal/VTABLE_00000070 pack() Structure VTABLE_00000070 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" - 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" + 0 _func___thiscall_int * 8 BNS::B::fb1_1 "" + 8 _func___thiscall_int * 8 CNS::C::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } Length: 24 Alignment: 8"""; @@ -2259,7 +2259,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /DNS/D/!internal/VTABLE_00000080 pack() Structure VTABLE_00000080 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 DNS::D::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -2534,7 +2534,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ENS/E/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 ENS::E::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -2550,7 +2550,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ENS/E/!internal/VTABLE_00000030 pack() Structure VTABLE_00000030 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 ANS::A::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -2566,7 +2566,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ENS/E/!internal/VTABLE_00000040 pack() Structure VTABLE_00000040 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb1_1 "" 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } @@ -2582,7 +2582,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ENS/E/!internal/VTABLE_00000050 pack() Structure VTABLE_00000050 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -2741,7 +2741,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /FNS/F/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 FNS::F::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -2889,7 +2889,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /GNS/G/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 GNS::G::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -3037,7 +3037,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /HNS/H/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 HNS::H::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -3248,7 +3248,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /INS/I/!internal/VTABLE_00000038 pack() Structure VTABLE_00000038 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 INS::I::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -3378,7 +3378,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /JNS/J/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 JNS::J::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -3526,7 +3526,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /KNS/K/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 KNS::K::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -3692,7 +3692,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /LNS/L/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 LNS::L::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -4780,7 +4780,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_000000d0 pack() Structure VTABLE_000000d0 { - 0 _func___thiscall_int * 8 N1NS::N1::fn1_1 "" + 0 _func___thiscall_int * 8 MNS::M::fn1_1 "" 8 _func___thiscall_int * 8 N1NS::N1::fn1_2 "" } Length: 16 Alignment: 8"""; @@ -4795,8 +4795,8 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_000000e0 pack() Structure VTABLE_000000e0 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" - 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" + 0 _func___thiscall_int * 8 MNS::M::fa1_1 "" + 8 _func___thiscall_int * 8 CNS::C::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } Length: 24 Alignment: 8"""; @@ -4811,7 +4811,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_000000f0 pack() Structure VTABLE_000000f0 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 MNS::M::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -4827,8 +4827,8 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000100 pack() Structure VTABLE_00000100 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" - 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" + 0 _func___thiscall_int * 8 MNS::M::fb1_1 "" + 8 _func___thiscall_int * 8 CNS::C::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } Length: 24 Alignment: 8"""; @@ -4843,7 +4843,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000110 pack() Structure VTABLE_00000110 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 MNS::M::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -4903,8 +4903,8 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_000000d0 pack() Structure VTABLE_000000d0 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" - 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" + 0 _func___thiscall_int * 8 MNS::M::fa1_1 "" + 8 _func___thiscall_int * 8 CNS::C::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } Length: 24 Alignment: 8"""; @@ -4919,7 +4919,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_000000e0 pack() Structure VTABLE_000000e0 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 MNS::M::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -4935,8 +4935,8 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_000000f0 pack() Structure VTABLE_000000f0 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" - 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" + 0 _func___thiscall_int * 8 MNS::M::fb1_1 "" + 8 _func___thiscall_int * 8 CNS::C::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } Length: 24 Alignment: 8"""; @@ -4951,7 +4951,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000100 pack() Structure VTABLE_00000100 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 MNS::M::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -4996,7 +4996,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /MNS/M/!internal/VTABLE_00000128 pack() Structure VTABLE_00000128 { - 0 _func___thiscall_int * 8 N1NS::N1::fn1_1 "" + 0 _func___thiscall_int * 8 MNS::M::fn1_1 "" 8 _func___thiscall_int * 8 N1NS::N1::fn1_2 "" } Length: 16 Alignment: 8"""; @@ -5323,7 +5323,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O1NS/O1/!internal/VTABLE_00000038 pack() Structure VTABLE_00000038 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 ANS::A::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -5339,7 +5339,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O1NS/O1/!internal/VTABLE_00000048 pack() Structure VTABLE_00000048 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 O1NS::O1::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -5355,7 +5355,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O1NS/O1/!internal/VTABLE_00000058 pack() Structure VTABLE_00000058 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb1_1 "" 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } @@ -5371,7 +5371,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O1NS/O1/!internal/VTABLE_00000068 pack() Structure VTABLE_00000068 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -5649,7 +5649,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O2NS/O2/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 ANS::A::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -5665,7 +5665,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O2NS/O2/!internal/VTABLE_00000030 pack() Structure VTABLE_00000030 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 O2NS::O2::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -5681,7 +5681,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O2NS/O2/!internal/VTABLE_00000040 pack() Structure VTABLE_00000040 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb1_1 "" 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } @@ -5697,7 +5697,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O2NS/O2/!internal/VTABLE_00000050 pack() Structure VTABLE_00000050 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -6039,7 +6039,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O3NS/O3/!internal/VTABLE_00000038 pack() Structure VTABLE_00000038 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 ANS::A::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -6055,7 +6055,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O3NS/O3/!internal/VTABLE_00000048 pack() Structure VTABLE_00000048 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 O3NS::O3::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -6071,7 +6071,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O3NS/O3/!internal/VTABLE_00000058 pack() Structure VTABLE_00000058 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb1_1 "" 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } @@ -6087,7 +6087,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O3NS/O3/!internal/VTABLE_00000068 pack() Structure VTABLE_00000068 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -6365,7 +6365,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O4NS/O4/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 ANS::A::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -6381,7 +6381,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O4NS/O4/!internal/VTABLE_00000030 pack() Structure VTABLE_00000030 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 O4NS::O4::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -6397,7 +6397,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O4NS/O4/!internal/VTABLE_00000040 pack() Structure VTABLE_00000040 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb1_1 "" 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } @@ -6413,7 +6413,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /O4NS/O4/!internal/VTABLE_00000050 pack() Structure VTABLE_00000050 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 BNS::B::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -6984,7 +6984,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ONS/O/!internal/VTABLE_00000060 pack() Structure VTABLE_00000060 { - 0 _func___thiscall_int * 8 A1NS::A1::fa1_1 "" + 0 _func___thiscall_int * 8 ONS::O::fa1_1 "" 8 _func___thiscall_int * 8 A1NS::A1::fa1_2 "" 16 _func___thiscall_int * 8 A1NS::A1::fa1_3 "" } @@ -7000,7 +7000,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ONS/O/!internal/VTABLE_00000070 pack() Structure VTABLE_00000070 { - 0 _func___thiscall_int * 8 A2NS::A2::fa2_1 "" + 0 _func___thiscall_int * 8 ONS::O::fa2_1 "" 8 _func___thiscall_int * 8 A2NS::A2::fa2_2 "" 16 _func___thiscall_int * 8 A2NS::A2::fa2_3 "" } @@ -7016,7 +7016,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ONS/O/!internal/VTABLE_00000080 pack() Structure VTABLE_00000080 { - 0 _func___thiscall_int * 8 B1NS::B1::fb1_1 "" + 0 _func___thiscall_int * 8 ONS::O::fb1_1 "" 8 _func___thiscall_int * 8 B1NS::B1::fb1_2 "" 16 _func___thiscall_int * 8 B1NS::B1::fb1_3 "" } @@ -7032,7 +7032,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { /ONS/O/!internal/VTABLE_00000090 pack() Structure VTABLE_00000090 { - 0 _func___thiscall_int * 8 B2NS::B2::fb2_1 "" + 0 _func___thiscall_int * 8 ONS::O::fb2_1 "" 8 _func___thiscall_int * 8 B2NS::B2::fb2_2 "" 16 _func___thiscall_int * 8 B2NS::B2::fb2_3 "" } @@ -7078,7 +7078,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { pack() Structure VTABLE_000000b8 { 0 _func___thiscall_int * 8 ANS::A::fa_1 "" - 8 _func___thiscall_int * 8 O3NS::O3::fo3_1 "" + 8 _func___thiscall_int * 8 ONS::O::fo3_1 "" } Length: 16 Alignment: 8"""; //@formatter:on @@ -7139,7 +7139,7 @@ public class Cfb464ProgramCreator extends ProgramCreator { pack() Structure VTABLE_000000f0 { 0 _func___thiscall_int * 8 ANS::A::fa_1 "" - 8 _func___thiscall_int * 8 O4NS::O4::fo4_1 "" + 8 _func___thiscall_int * 8 ONS::O::fo4_1 "" } Length: 16 Alignment: 8"""; //@formatter:on diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Egray832ProgramCreator.java b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Egray832ProgramCreator.java index e8ed7d3085..48c95b7a61 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Egray832ProgramCreator.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Egray832ProgramCreator.java @@ -7293,7 +7293,7 @@ public class Egray832ProgramCreator extends ProgramCreator { /T/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_undefined * 4 P::pvf "" + 0 _func___thiscall_undefined * 4 T::pvf "" } Length: 4 Alignment: 4"""; //@formatter:on @@ -7307,7 +7307,7 @@ public class Egray832ProgramCreator extends ProgramCreator { /T/!internal/VTABLE_0000000c pack() Structure VTABLE_0000000c { - 0 _func___thiscall_undefined * 4 P::pvf "" + 0 _func___thiscall_undefined * 4 T::pvf "" } Length: 4 Alignment: 4"""; //@formatter:on @@ -7517,7 +7517,7 @@ public class Egray832ProgramCreator extends ProgramCreator { /U/!internal/VTABLE_00000014 pack() Structure VTABLE_00000014 { - 0 _func___thiscall_undefined * 4 P::pvf "" + 0 _func___thiscall_undefined * 4 T::pvf "" } Length: 4 Alignment: 4"""; //@formatter:on @@ -7531,7 +7531,7 @@ public class Egray832ProgramCreator extends ProgramCreator { /U/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_undefined * 4 P::pvf "" + 0 _func___thiscall_undefined * 4 T::pvf "" } Length: 4 Alignment: 4"""; //@formatter:on diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Egray864ProgramCreator.java b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Egray864ProgramCreator.java index 3ac1f58938..1f12ea40c4 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Egray864ProgramCreator.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Egray864ProgramCreator.java @@ -7462,7 +7462,7 @@ public class Egray864ProgramCreator extends ProgramCreator { /T/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_undefined * 8 P::pvf "" + 0 _func___thiscall_undefined * 8 T::pvf "" } Length: 8 Alignment: 8"""; //@formatter:on @@ -7476,7 +7476,7 @@ public class Egray864ProgramCreator extends ProgramCreator { /T/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_undefined * 8 P::pvf "" + 0 _func___thiscall_undefined * 8 T::pvf "" } Length: 8 Alignment: 8"""; //@formatter:on @@ -7691,7 +7691,7 @@ public class Egray864ProgramCreator extends ProgramCreator { /U/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_undefined * 8 P::pvf "" + 0 _func___thiscall_undefined * 8 T::pvf "" } Length: 8 Alignment: 8"""; //@formatter:on @@ -7705,7 +7705,7 @@ public class Egray864ProgramCreator extends ProgramCreator { /U/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_undefined * 8 P::pvf "" + 0 _func___thiscall_undefined * 8 T::pvf "" } Length: 8 Alignment: 8"""; //@formatter:on diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Vftm32ProgramCreator.java b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Vftm32ProgramCreator.java index 755df19929..ae15f6728f 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Vftm32ProgramCreator.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Vftm32ProgramCreator.java @@ -1304,7 +1304,7 @@ public class Vftm32ProgramCreator extends ProgramCreator { 28 _func___thiscall_int_int * 4 P2NS::P2::fp2_8 "" 32 _func___thiscall_int * 4 P2NS::P2::fp2_8 "" 36 _func___thiscall_int * 4 P2NS::P2::fp2_9 "" - 40 _func___thiscall_int_int * 4 Q2NS::Q2::fp2_10 "" + 40 _func___thiscall_int_int * 4 P2NS::P2::fp2_10 "" 44 _func___thiscall_int * 4 Q2NS::Q2::fp2_10 "" } Length: 48 Alignment: 4"""; @@ -1689,15 +1689,15 @@ public class Vftm32ProgramCreator extends ProgramCreator { /Q4NS/Q4/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 4 P1NS::P1::fp1_3 "" - 4 _func___thiscall_int_int * 4 P1NS::P1::fp1_4 "" - 8 _func___thiscall_int * 4 P1NS::P1::fp1_4 "" - 12 _func___thiscall_int * 4 P1NS::P1::fp1_5 "" - 16 _func___thiscall_int_int * 4 P1NS::P1::fp1_6 "" - 20 _func___thiscall_int * 4 P1NS::P1::fp1_6 "" - 24 _func___thiscall_int * 4 P1NS::P1::fp1_7 "" - 28 _func___thiscall_int_int * 4 P1NS::P1::fp1_8 "" - 32 _func___thiscall_int * 4 P1NS::P1::fp1_8 "" + 0 _func___thiscall_int * 4 Q4NS::Q4::fp1_3 "" + 4 _func___thiscall_int_int * 4 Q4NS::Q4::fp1_4 "" + 8 _func___thiscall_int * 4 Q4NS::Q4::fp1_4 "" + 12 _func___thiscall_int * 4 Q4NS::Q4::fp1_5 "" + 16 _func___thiscall_int_int * 4 Q4NS::Q4::fp1_6 "" + 20 _func___thiscall_int * 4 Q4NS::Q4::fp1_6 "" + 24 _func___thiscall_int * 4 Q4NS::Q4::fp1_7 "" + 28 _func___thiscall_int_int * 4 Q4NS::Q4::fp1_8 "" + 32 _func___thiscall_int * 4 Q4NS::Q4::fp1_8 "" } Length: 36 Alignment: 4"""; //@formatter:on @@ -1912,18 +1912,18 @@ public class Vftm32ProgramCreator extends ProgramCreator { /Q5NS/Q5/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 4 P2NS::P2::fp2_3 "" - 4 _func___thiscall_int_int * 4 P2NS::P2::fp2_4 "" - 8 _func___thiscall_int * 4 P2NS::P2::fp2_4 "" - 12 _func___thiscall_int * 4 P2NS::P2::fp2_5 "" - 16 _func___thiscall_int_int * 4 P2NS::P2::fp2_6 "" - 20 _func___thiscall_int * 4 P2NS::P2::fp2_6 "" - 24 _func___thiscall_int * 4 P2NS::P2::fp2_7 "" - 28 _func___thiscall_int_int * 4 P2NS::P2::fp2_8 "" - 32 _func___thiscall_int * 4 P2NS::P2::fp2_8 "" - 36 _func___thiscall_int * 4 P2NS::P2::fp2_9 "" - 40 _func___thiscall_int_int * 4 P2NS::P2::fp2_10 "" - 44 _func___thiscall_int * 4 P2NS::P2::fp2_10 "" + 0 _func___thiscall_int * 4 Q5NS::Q5::fp2_3 "" + 4 _func___thiscall_int_int * 4 Q5NS::Q5::fp2_4 "" + 8 _func___thiscall_int * 4 Q5NS::Q5::fp2_4 "" + 12 _func___thiscall_int * 4 Q5NS::Q5::fp2_5 "" + 16 _func___thiscall_int_int * 4 Q5NS::Q5::fp2_6 "" + 20 _func___thiscall_int * 4 Q5NS::Q5::fp2_6 "" + 24 _func___thiscall_int * 4 Q5NS::Q5::fp2_7 "" + 28 _func___thiscall_int_int * 4 Q5NS::Q5::fp2_8 "" + 32 _func___thiscall_int * 4 Q5NS::Q5::fp2_8 "" + 36 _func___thiscall_int * 4 Q5NS::Q5::fp2_9 "" + 40 _func___thiscall_int_int * 4 Q5NS::Q5::fp2_10 "" + 44 _func___thiscall_int * 4 Q5NS::Q5::fp2_10 "" } Length: 48 Alignment: 4"""; //@formatter:on @@ -2138,18 +2138,18 @@ public class Vftm32ProgramCreator extends ProgramCreator { /Q6NS/Q6/!internal/VTABLE_00000010 pack() Structure VTABLE_00000010 { - 0 _func___thiscall_int * 4 P2NS::P2::fp2_3 "" - 4 _func___thiscall_int_int * 4 P2NS::P2::fp2_4 "" - 8 _func___thiscall_int * 4 P2NS::P2::fp2_4 "" - 12 _func___thiscall_int * 4 P2NS::P2::fp2_5 "" - 16 _func___thiscall_int_int * 4 P2NS::P2::fp2_6 "" - 20 _func___thiscall_int * 4 P2NS::P2::fp2_6 "" - 24 _func___thiscall_int * 4 P2NS::P2::fp2_7 "" - 28 _func___thiscall_int_int * 4 P2NS::P2::fp2_8 "" - 32 _func___thiscall_int * 4 P2NS::P2::fp2_8 "" - 36 _func___thiscall_int * 4 P2NS::P2::fp2_9 "" - 40 _func___thiscall_int_int * 4 P2NS::P2::fp2_10 "" - 44 _func___thiscall_int * 4 P2NS::P2::fp2_10 "" + 0 _func___thiscall_int * 4 Q6NS::Q6::fp2_3 "" + 4 _func___thiscall_int_int * 4 Q6NS::Q6::fp2_4 "" + 8 _func___thiscall_int * 4 Q6NS::Q6::fp2_4 "" + 12 _func___thiscall_int * 4 Q6NS::Q6::fp2_5 "" + 16 _func___thiscall_int_int * 4 Q6NS::Q6::fp2_6 "" + 20 _func___thiscall_int * 4 Q6NS::Q6::fp2_6 "" + 24 _func___thiscall_int * 4 Q6NS::Q6::fp2_7 "" + 28 _func___thiscall_int_int * 4 Q6NS::Q6::fp2_8 "" + 32 _func___thiscall_int * 4 Q6NS::Q6::fp2_8 "" + 36 _func___thiscall_int * 4 Q6NS::Q6::fp2_9 "" + 40 _func___thiscall_int_int * 4 Q6NS::Q6::fp2_10 "" + 44 _func___thiscall_int * 4 Q6NS::Q6::fp2_10 "" } Length: 48 Alignment: 4"""; //@formatter:on @@ -2358,15 +2358,15 @@ public class Vftm32ProgramCreator extends ProgramCreator { /Q7NS/Q7/!internal/VTABLE_0000000c pack() Structure VTABLE_0000000c { - 0 _func___thiscall_int * 4 P1NS::P1::fp1_3 "" - 4 _func___thiscall_int_int * 4 P1NS::P1::fp1_4 "" - 8 _func___thiscall_int * 4 P1NS::P1::fp1_4 "" - 12 _func___thiscall_int * 4 P1NS::P1::fp1_5 "" - 16 _func___thiscall_int_int * 4 P1NS::P1::fp1_6 "" - 20 _func___thiscall_int * 4 P1NS::P1::fp1_6 "" - 24 _func___thiscall_int * 4 P1NS::P1::fp1_7 "" - 28 _func___thiscall_int_int * 4 P1NS::P1::fp1_8 "" - 32 _func___thiscall_int * 4 P1NS::P1::fp1_8 "" + 0 _func___thiscall_int * 4 Q7NS::Q7::fp1_3 "" + 4 _func___thiscall_int_int * 4 Q7NS::Q7::fp1_4 "" + 8 _func___thiscall_int * 4 Q7NS::Q7::fp1_4 "" + 12 _func___thiscall_int * 4 Q7NS::Q7::fp1_5 "" + 16 _func___thiscall_int_int * 4 Q7NS::Q7::fp1_6 "" + 20 _func___thiscall_int * 4 Q7NS::Q7::fp1_6 "" + 24 _func___thiscall_int * 4 Q7NS::Q7::fp1_7 "" + 28 _func___thiscall_int_int * 4 Q7NS::Q7::fp1_8 "" + 32 _func___thiscall_int * 4 Q7NS::Q7::fp1_8 "" } Length: 36 Alignment: 4"""; //@formatter:on @@ -2380,18 +2380,18 @@ public class Vftm32ProgramCreator extends ProgramCreator { /Q7NS/Q7/!internal/VTABLE_00000014 pack() Structure VTABLE_00000014 { - 0 _func___thiscall_int * 4 P2NS::P2::fp2_3 "" - 4 _func___thiscall_int_int * 4 P2NS::P2::fp2_4 "" - 8 _func___thiscall_int * 4 P2NS::P2::fp2_4 "" - 12 _func___thiscall_int * 4 P2NS::P2::fp2_5 "" - 16 _func___thiscall_int_int * 4 P2NS::P2::fp2_6 "" - 20 _func___thiscall_int * 4 P2NS::P2::fp2_6 "" - 24 _func___thiscall_int * 4 P2NS::P2::fp2_7 "" - 28 _func___thiscall_int_int * 4 P2NS::P2::fp2_8 "" - 32 _func___thiscall_int * 4 P2NS::P2::fp2_8 "" - 36 _func___thiscall_int * 4 P2NS::P2::fp2_9 "" - 40 _func___thiscall_int_int * 4 P2NS::P2::fp2_10 "" - 44 _func___thiscall_int * 4 P2NS::P2::fp2_10 "" + 0 _func___thiscall_int * 4 Q7NS::Q7::fp2_3 "" + 4 _func___thiscall_int_int * 4 Q7NS::Q7::fp2_4 "" + 8 _func___thiscall_int * 4 Q7NS::Q7::fp2_4 "" + 12 _func___thiscall_int * 4 Q7NS::Q7::fp2_5 "" + 16 _func___thiscall_int_int * 4 Q7NS::Q7::fp2_6 "" + 20 _func___thiscall_int * 4 Q7NS::Q7::fp2_6 "" + 24 _func___thiscall_int * 4 Q7NS::Q7::fp2_7 "" + 28 _func___thiscall_int_int * 4 Q7NS::Q7::fp2_8 "" + 32 _func___thiscall_int * 4 Q7NS::Q7::fp2_8 "" + 36 _func___thiscall_int * 4 Q7NS::Q7::fp2_9 "" + 40 _func___thiscall_int_int * 4 Q7NS::Q7::fp2_10 "" + 44 _func___thiscall_int * 4 Q7NS::Q7::fp2_10 "" } Length: 48 Alignment: 4"""; //@formatter:on @@ -2692,16 +2692,16 @@ public class Vftm32ProgramCreator extends ProgramCreator { /R1NS/R1/!internal/VTABLE_0000000c pack() Structure VTABLE_0000000c { - 0 _func___thiscall_int * 4 Q1NS::Q1::fp1_3 "" - 4 _func___thiscall_int_int * 4 Q1NS::Q1::fp1_4 "" - 8 _func___thiscall_int * 4 Q1NS::Q1::fp1_4 "" - 12 _func___thiscall_int * 4 Q1NS::Q1::fp1_5 "" - 16 _func___thiscall_int_int * 4 Q1NS::Q1::fp1_6 "" - 20 _func___thiscall_int * 4 Q1NS::Q1::fp1_6 "" - 24 _func___thiscall_int * 4 Q1NS::Q1::fp1_7 "" - 28 _func___thiscall_int_int * 4 Q1NS::Q1::fp1_8 "" - 32 _func___thiscall_int * 4 Q1NS::Q1::fp1_8 "" - 36 _func___thiscall_int_int * 4 Q1NS::Q1::fq1_3 "" + 0 _func___thiscall_int * 4 R1NS::R1::fp1_3 "" + 4 _func___thiscall_int_int * 4 R1NS::R1::fp1_4 "" + 8 _func___thiscall_int * 4 R1NS::R1::fp1_4 "" + 12 _func___thiscall_int * 4 R1NS::R1::fp1_5 "" + 16 _func___thiscall_int_int * 4 R1NS::R1::fp1_6 "" + 20 _func___thiscall_int * 4 R1NS::R1::fp1_6 "" + 24 _func___thiscall_int * 4 R1NS::R1::fp1_7 "" + 28 _func___thiscall_int_int * 4 R1NS::R1::fp1_8 "" + 32 _func___thiscall_int * 4 R1NS::R1::fp1_8 "" + 36 _func___thiscall_int_int * 4 R1NS::R1::fq1_3 "" 40 _func___thiscall_int * 4 Q1NS::Q1::fq1_3 "" } Length: 44 Alignment: 4"""; @@ -2716,18 +2716,18 @@ public class Vftm32ProgramCreator extends ProgramCreator { /R1NS/R1/!internal/VTABLE_00000014 pack() Structure VTABLE_00000014 { - 0 _func___thiscall_int * 4 P2NS::P2::fp2_3 "" - 4 _func___thiscall_int_int * 4 P2NS::P2::fp2_4 "" - 8 _func___thiscall_int * 4 P2NS::P2::fp2_4 "" - 12 _func___thiscall_int * 4 P2NS::P2::fp2_5 "" - 16 _func___thiscall_int_int * 4 P2NS::P2::fp2_6 "" - 20 _func___thiscall_int * 4 P2NS::P2::fp2_6 "" - 24 _func___thiscall_int * 4 P2NS::P2::fp2_7 "" - 28 _func___thiscall_int_int * 4 P2NS::P2::fp2_8 "" - 32 _func___thiscall_int * 4 P2NS::P2::fp2_8 "" - 36 _func___thiscall_int * 4 P2NS::P2::fp2_9 "" - 40 _func___thiscall_int_int * 4 P2NS::P2::fp2_10 "" - 44 _func___thiscall_int * 4 P2NS::P2::fp2_10 "" + 0 _func___thiscall_int * 4 R1NS::R1::fp2_3 "" + 4 _func___thiscall_int_int * 4 R1NS::R1::fp2_4 "" + 8 _func___thiscall_int * 4 R1NS::R1::fp2_4 "" + 12 _func___thiscall_int * 4 R1NS::R1::fp2_5 "" + 16 _func___thiscall_int_int * 4 R1NS::R1::fp2_6 "" + 20 _func___thiscall_int * 4 R1NS::R1::fp2_6 "" + 24 _func___thiscall_int * 4 R1NS::R1::fp2_7 "" + 28 _func___thiscall_int_int * 4 R1NS::R1::fp2_8 "" + 32 _func___thiscall_int * 4 R1NS::R1::fp2_8 "" + 36 _func___thiscall_int * 4 R1NS::R1::fp2_9 "" + 40 _func___thiscall_int_int * 4 R1NS::R1::fp2_10 "" + 44 _func___thiscall_int * 4 R1NS::R1::fp2_10 "" } Length: 48 Alignment: 4"""; //@formatter:on @@ -2741,19 +2741,19 @@ public class Vftm32ProgramCreator extends ProgramCreator { /R1NS/R1/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 4 Q2NS::Q2::fp1_3 "" - 4 _func___thiscall_int_int * 4 Q2NS::Q2::fp1_4 "" - 8 _func___thiscall_int * 4 Q2NS::Q2::fp1_4 "" - 12 _func___thiscall_int * 4 Q2NS::Q2::fp1_5 "" - 16 _func___thiscall_int_int * 4 Q2NS::Q2::fp1_6 "" - 20 _func___thiscall_int * 4 Q2NS::Q2::fp1_6 "" - 24 _func___thiscall_int * 4 Q2NS::Q2::fp1_7 "" - 28 _func___thiscall_int_int * 4 Q2NS::Q2::fp1_8 "" - 32 _func___thiscall_int * 4 Q2NS::Q2::fp1_8 "" + 0 _func___thiscall_int * 4 R1NS::R1::fp1_3 "" + 4 _func___thiscall_int_int * 4 R1NS::R1::fp1_4 "" + 8 _func___thiscall_int * 4 R1NS::R1::fp1_4 "" + 12 _func___thiscall_int * 4 R1NS::R1::fp1_5 "" + 16 _func___thiscall_int_int * 4 R1NS::R1::fp1_6 "" + 20 _func___thiscall_int * 4 R1NS::R1::fp1_6 "" + 24 _func___thiscall_int * 4 R1NS::R1::fp1_7 "" + 28 _func___thiscall_int_int * 4 R1NS::R1::fp1_8 "" + 32 _func___thiscall_int * 4 R1NS::R1::fp1_8 "" 36 _func___thiscall_int * 4 Q2NS::Q2::fq1_3 "" 40 _func___thiscall_int * 4 Q2NS::Q2::fp2_11 "" 44 _func___thiscall_int_int * 4 Q2NS::Q2::fp2_12 "" - 48 _func___thiscall_int_int * 4 Q2NS::Q2::fq2_3 "" + 48 _func___thiscall_int_int * 4 R1NS::R1::fq2_3 "" } Length: 52 Alignment: 4"""; //@formatter:on @@ -2767,18 +2767,18 @@ public class Vftm32ProgramCreator extends ProgramCreator { /R1NS/R1/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 4 P2NS::P2::fp2_3 "" - 4 _func___thiscall_int_int * 4 P2NS::P2::fp2_4 "" - 8 _func___thiscall_int * 4 P2NS::P2::fp2_4 "" - 12 _func___thiscall_int * 4 P2NS::P2::fp2_5 "" - 16 _func___thiscall_int_int * 4 P2NS::P2::fp2_6 "" - 20 _func___thiscall_int * 4 P2NS::P2::fp2_6 "" - 24 _func___thiscall_int * 4 P2NS::P2::fp2_7 "" - 28 _func___thiscall_int_int * 4 P2NS::P2::fp2_8 "" - 32 _func___thiscall_int * 4 P2NS::P2::fp2_8 "" - 36 _func___thiscall_int * 4 P2NS::P2::fp2_9 "" - 40 _func___thiscall_int_int * 4 Q2NS::Q2::fp2_10 "" - 44 _func___thiscall_int * 4 Q2NS::Q2::fp2_10 "" + 0 _func___thiscall_int * 4 R1NS::R1::fp2_3 "" + 4 _func___thiscall_int_int * 4 R1NS::R1::fp2_4 "" + 8 _func___thiscall_int * 4 R1NS::R1::fp2_4 "" + 12 _func___thiscall_int * 4 R1NS::R1::fp2_5 "" + 16 _func___thiscall_int_int * 4 R1NS::R1::fp2_6 "" + 20 _func___thiscall_int * 4 R1NS::R1::fp2_6 "" + 24 _func___thiscall_int * 4 R1NS::R1::fp2_7 "" + 28 _func___thiscall_int_int * 4 R1NS::R1::fp2_8 "" + 32 _func___thiscall_int * 4 R1NS::R1::fp2_8 "" + 36 _func___thiscall_int * 4 R1NS::R1::fp2_9 "" + 40 _func___thiscall_int_int * 4 R1NS::R1::fp2_10 "" + 44 _func___thiscall_int * 4 R1NS::R1::fp2_10 "" } Length: 48 Alignment: 4"""; //@formatter:on diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Vftm64ProgramCreator.java b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Vftm64ProgramCreator.java index 8580f89f16..9f52a5ef18 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Vftm64ProgramCreator.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/app/util/pdb/Vftm64ProgramCreator.java @@ -1318,7 +1318,7 @@ public class Vftm64ProgramCreator extends ProgramCreator { 56 _func___thiscall_int_int * 8 P2NS::P2::fp2_8 "" 64 _func___thiscall_int * 8 P2NS::P2::fp2_8 "" 72 _func___thiscall_int * 8 P2NS::P2::fp2_9 "" - 80 _func___thiscall_int_int * 8 Q2NS::Q2::fp2_10 "" + 80 _func___thiscall_int_int * 8 P2NS::P2::fp2_10 "" 88 _func___thiscall_int * 8 Q2NS::Q2::fp2_10 "" } Length: 96 Alignment: 8"""; @@ -1709,15 +1709,15 @@ public class Vftm64ProgramCreator extends ProgramCreator { /Q4NS/Q4/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 8 P1NS::P1::fp1_3 "" - 8 _func___thiscall_int_int * 8 P1NS::P1::fp1_4 "" - 16 _func___thiscall_int * 8 P1NS::P1::fp1_4 "" - 24 _func___thiscall_int * 8 P1NS::P1::fp1_5 "" - 32 _func___thiscall_int_int * 8 P1NS::P1::fp1_6 "" - 40 _func___thiscall_int * 8 P1NS::P1::fp1_6 "" - 48 _func___thiscall_int * 8 P1NS::P1::fp1_7 "" - 56 _func___thiscall_int_int * 8 P1NS::P1::fp1_8 "" - 64 _func___thiscall_int * 8 P1NS::P1::fp1_8 "" + 0 _func___thiscall_int * 8 Q4NS::Q4::fp1_3 "" + 8 _func___thiscall_int_int * 8 Q4NS::Q4::fp1_4 "" + 16 _func___thiscall_int * 8 Q4NS::Q4::fp1_4 "" + 24 _func___thiscall_int * 8 Q4NS::Q4::fp1_5 "" + 32 _func___thiscall_int_int * 8 Q4NS::Q4::fp1_6 "" + 40 _func___thiscall_int * 8 Q4NS::Q4::fp1_6 "" + 48 _func___thiscall_int * 8 Q4NS::Q4::fp1_7 "" + 56 _func___thiscall_int_int * 8 Q4NS::Q4::fp1_8 "" + 64 _func___thiscall_int * 8 Q4NS::Q4::fp1_8 "" } Length: 72 Alignment: 8"""; //@formatter:on @@ -1935,18 +1935,18 @@ public class Vftm64ProgramCreator extends ProgramCreator { /Q5NS/Q5/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 8 P2NS::P2::fp2_3 "" - 8 _func___thiscall_int_int * 8 P2NS::P2::fp2_4 "" - 16 _func___thiscall_int * 8 P2NS::P2::fp2_4 "" - 24 _func___thiscall_int * 8 P2NS::P2::fp2_5 "" - 32 _func___thiscall_int_int * 8 P2NS::P2::fp2_6 "" - 40 _func___thiscall_int * 8 P2NS::P2::fp2_6 "" - 48 _func___thiscall_int * 8 P2NS::P2::fp2_7 "" - 56 _func___thiscall_int_int * 8 P2NS::P2::fp2_8 "" - 64 _func___thiscall_int * 8 P2NS::P2::fp2_8 "" - 72 _func___thiscall_int * 8 P2NS::P2::fp2_9 "" - 80 _func___thiscall_int_int * 8 P2NS::P2::fp2_10 "" - 88 _func___thiscall_int * 8 P2NS::P2::fp2_10 "" + 0 _func___thiscall_int * 8 Q5NS::Q5::fp2_3 "" + 8 _func___thiscall_int_int * 8 Q5NS::Q5::fp2_4 "" + 16 _func___thiscall_int * 8 Q5NS::Q5::fp2_4 "" + 24 _func___thiscall_int * 8 Q5NS::Q5::fp2_5 "" + 32 _func___thiscall_int_int * 8 Q5NS::Q5::fp2_6 "" + 40 _func___thiscall_int * 8 Q5NS::Q5::fp2_6 "" + 48 _func___thiscall_int * 8 Q5NS::Q5::fp2_7 "" + 56 _func___thiscall_int_int * 8 Q5NS::Q5::fp2_8 "" + 64 _func___thiscall_int * 8 Q5NS::Q5::fp2_8 "" + 72 _func___thiscall_int * 8 Q5NS::Q5::fp2_9 "" + 80 _func___thiscall_int_int * 8 Q5NS::Q5::fp2_10 "" + 88 _func___thiscall_int * 8 Q5NS::Q5::fp2_10 "" } Length: 96 Alignment: 8"""; //@formatter:on @@ -2164,18 +2164,18 @@ public class Vftm64ProgramCreator extends ProgramCreator { /Q6NS/Q6/!internal/VTABLE_00000020 pack() Structure VTABLE_00000020 { - 0 _func___thiscall_int * 8 P2NS::P2::fp2_3 "" - 8 _func___thiscall_int_int * 8 P2NS::P2::fp2_4 "" - 16 _func___thiscall_int * 8 P2NS::P2::fp2_4 "" - 24 _func___thiscall_int * 8 P2NS::P2::fp2_5 "" - 32 _func___thiscall_int_int * 8 P2NS::P2::fp2_6 "" - 40 _func___thiscall_int * 8 P2NS::P2::fp2_6 "" - 48 _func___thiscall_int * 8 P2NS::P2::fp2_7 "" - 56 _func___thiscall_int_int * 8 P2NS::P2::fp2_8 "" - 64 _func___thiscall_int * 8 P2NS::P2::fp2_8 "" - 72 _func___thiscall_int * 8 P2NS::P2::fp2_9 "" - 80 _func___thiscall_int_int * 8 P2NS::P2::fp2_10 "" - 88 _func___thiscall_int * 8 P2NS::P2::fp2_10 "" + 0 _func___thiscall_int * 8 Q6NS::Q6::fp2_3 "" + 8 _func___thiscall_int_int * 8 Q6NS::Q6::fp2_4 "" + 16 _func___thiscall_int * 8 Q6NS::Q6::fp2_4 "" + 24 _func___thiscall_int * 8 Q6NS::Q6::fp2_5 "" + 32 _func___thiscall_int_int * 8 Q6NS::Q6::fp2_6 "" + 40 _func___thiscall_int * 8 Q6NS::Q6::fp2_6 "" + 48 _func___thiscall_int * 8 Q6NS::Q6::fp2_7 "" + 56 _func___thiscall_int_int * 8 Q6NS::Q6::fp2_8 "" + 64 _func___thiscall_int * 8 Q6NS::Q6::fp2_8 "" + 72 _func___thiscall_int * 8 Q6NS::Q6::fp2_9 "" + 80 _func___thiscall_int_int * 8 Q6NS::Q6::fp2_10 "" + 88 _func___thiscall_int * 8 Q6NS::Q6::fp2_10 "" } Length: 96 Alignment: 8"""; //@formatter:on @@ -2387,15 +2387,15 @@ public class Vftm64ProgramCreator extends ProgramCreator { /Q7NS/Q7/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 8 P1NS::P1::fp1_3 "" - 8 _func___thiscall_int_int * 8 P1NS::P1::fp1_4 "" - 16 _func___thiscall_int * 8 P1NS::P1::fp1_4 "" - 24 _func___thiscall_int * 8 P1NS::P1::fp1_5 "" - 32 _func___thiscall_int_int * 8 P1NS::P1::fp1_6 "" - 40 _func___thiscall_int * 8 P1NS::P1::fp1_6 "" - 48 _func___thiscall_int * 8 P1NS::P1::fp1_7 "" - 56 _func___thiscall_int_int * 8 P1NS::P1::fp1_8 "" - 64 _func___thiscall_int * 8 P1NS::P1::fp1_8 "" + 0 _func___thiscall_int * 8 Q7NS::Q7::fp1_3 "" + 8 _func___thiscall_int_int * 8 Q7NS::Q7::fp1_4 "" + 16 _func___thiscall_int * 8 Q7NS::Q7::fp1_4 "" + 24 _func___thiscall_int * 8 Q7NS::Q7::fp1_5 "" + 32 _func___thiscall_int_int * 8 Q7NS::Q7::fp1_6 "" + 40 _func___thiscall_int * 8 Q7NS::Q7::fp1_6 "" + 48 _func___thiscall_int * 8 Q7NS::Q7::fp1_7 "" + 56 _func___thiscall_int_int * 8 Q7NS::Q7::fp1_8 "" + 64 _func___thiscall_int * 8 Q7NS::Q7::fp1_8 "" } Length: 72 Alignment: 8"""; //@formatter:on @@ -2409,18 +2409,18 @@ public class Vftm64ProgramCreator extends ProgramCreator { /Q7NS/Q7/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 8 P2NS::P2::fp2_3 "" - 8 _func___thiscall_int_int * 8 P2NS::P2::fp2_4 "" - 16 _func___thiscall_int * 8 P2NS::P2::fp2_4 "" - 24 _func___thiscall_int * 8 P2NS::P2::fp2_5 "" - 32 _func___thiscall_int_int * 8 P2NS::P2::fp2_6 "" - 40 _func___thiscall_int * 8 P2NS::P2::fp2_6 "" - 48 _func___thiscall_int * 8 P2NS::P2::fp2_7 "" - 56 _func___thiscall_int_int * 8 P2NS::P2::fp2_8 "" - 64 _func___thiscall_int * 8 P2NS::P2::fp2_8 "" - 72 _func___thiscall_int * 8 P2NS::P2::fp2_9 "" - 80 _func___thiscall_int_int * 8 P2NS::P2::fp2_10 "" - 88 _func___thiscall_int * 8 P2NS::P2::fp2_10 "" + 0 _func___thiscall_int * 8 Q7NS::Q7::fp2_3 "" + 8 _func___thiscall_int_int * 8 Q7NS::Q7::fp2_4 "" + 16 _func___thiscall_int * 8 Q7NS::Q7::fp2_4 "" + 24 _func___thiscall_int * 8 Q7NS::Q7::fp2_5 "" + 32 _func___thiscall_int_int * 8 Q7NS::Q7::fp2_6 "" + 40 _func___thiscall_int * 8 Q7NS::Q7::fp2_6 "" + 48 _func___thiscall_int * 8 Q7NS::Q7::fp2_7 "" + 56 _func___thiscall_int_int * 8 Q7NS::Q7::fp2_8 "" + 64 _func___thiscall_int * 8 Q7NS::Q7::fp2_8 "" + 72 _func___thiscall_int * 8 Q7NS::Q7::fp2_9 "" + 80 _func___thiscall_int_int * 8 Q7NS::Q7::fp2_10 "" + 88 _func___thiscall_int * 8 Q7NS::Q7::fp2_10 "" } Length: 96 Alignment: 8"""; //@formatter:on @@ -2728,16 +2728,16 @@ public class Vftm64ProgramCreator extends ProgramCreator { /R1NS/R1/!internal/VTABLE_00000018 pack() Structure VTABLE_00000018 { - 0 _func___thiscall_int * 8 Q1NS::Q1::fp1_3 "" - 8 _func___thiscall_int_int * 8 Q1NS::Q1::fp1_4 "" - 16 _func___thiscall_int * 8 Q1NS::Q1::fp1_4 "" - 24 _func___thiscall_int * 8 Q1NS::Q1::fp1_5 "" - 32 _func___thiscall_int_int * 8 Q1NS::Q1::fp1_6 "" - 40 _func___thiscall_int * 8 Q1NS::Q1::fp1_6 "" - 48 _func___thiscall_int * 8 Q1NS::Q1::fp1_7 "" - 56 _func___thiscall_int_int * 8 Q1NS::Q1::fp1_8 "" - 64 _func___thiscall_int * 8 Q1NS::Q1::fp1_8 "" - 72 _func___thiscall_int_int * 8 Q1NS::Q1::fq1_3 "" + 0 _func___thiscall_int * 8 R1NS::R1::fp1_3 "" + 8 _func___thiscall_int_int * 8 R1NS::R1::fp1_4 "" + 16 _func___thiscall_int * 8 R1NS::R1::fp1_4 "" + 24 _func___thiscall_int * 8 R1NS::R1::fp1_5 "" + 32 _func___thiscall_int_int * 8 R1NS::R1::fp1_6 "" + 40 _func___thiscall_int * 8 R1NS::R1::fp1_6 "" + 48 _func___thiscall_int * 8 R1NS::R1::fp1_7 "" + 56 _func___thiscall_int_int * 8 R1NS::R1::fp1_8 "" + 64 _func___thiscall_int * 8 R1NS::R1::fp1_8 "" + 72 _func___thiscall_int_int * 8 R1NS::R1::fq1_3 "" 80 _func___thiscall_int * 8 Q1NS::Q1::fq1_3 "" } Length: 88 Alignment: 8"""; @@ -2752,18 +2752,18 @@ public class Vftm64ProgramCreator extends ProgramCreator { /R1NS/R1/!internal/VTABLE_00000028 pack() Structure VTABLE_00000028 { - 0 _func___thiscall_int * 8 P2NS::P2::fp2_3 "" - 8 _func___thiscall_int_int * 8 P2NS::P2::fp2_4 "" - 16 _func___thiscall_int * 8 P2NS::P2::fp2_4 "" - 24 _func___thiscall_int * 8 P2NS::P2::fp2_5 "" - 32 _func___thiscall_int_int * 8 P2NS::P2::fp2_6 "" - 40 _func___thiscall_int * 8 P2NS::P2::fp2_6 "" - 48 _func___thiscall_int * 8 P2NS::P2::fp2_7 "" - 56 _func___thiscall_int_int * 8 P2NS::P2::fp2_8 "" - 64 _func___thiscall_int * 8 P2NS::P2::fp2_8 "" - 72 _func___thiscall_int * 8 P2NS::P2::fp2_9 "" - 80 _func___thiscall_int_int * 8 P2NS::P2::fp2_10 "" - 88 _func___thiscall_int * 8 P2NS::P2::fp2_10 "" + 0 _func___thiscall_int * 8 R1NS::R1::fp2_3 "" + 8 _func___thiscall_int_int * 8 R1NS::R1::fp2_4 "" + 16 _func___thiscall_int * 8 R1NS::R1::fp2_4 "" + 24 _func___thiscall_int * 8 R1NS::R1::fp2_5 "" + 32 _func___thiscall_int_int * 8 R1NS::R1::fp2_6 "" + 40 _func___thiscall_int * 8 R1NS::R1::fp2_6 "" + 48 _func___thiscall_int * 8 R1NS::R1::fp2_7 "" + 56 _func___thiscall_int_int * 8 R1NS::R1::fp2_8 "" + 64 _func___thiscall_int * 8 R1NS::R1::fp2_8 "" + 72 _func___thiscall_int * 8 R1NS::R1::fp2_9 "" + 80 _func___thiscall_int_int * 8 R1NS::R1::fp2_10 "" + 88 _func___thiscall_int * 8 R1NS::R1::fp2_10 "" } Length: 96 Alignment: 8"""; //@formatter:on @@ -2777,19 +2777,19 @@ public class Vftm64ProgramCreator extends ProgramCreator { /R1NS/R1/!internal/VTABLE_00000040 pack() Structure VTABLE_00000040 { - 0 _func___thiscall_int * 8 Q2NS::Q2::fp1_3 "" - 8 _func___thiscall_int_int * 8 Q2NS::Q2::fp1_4 "" - 16 _func___thiscall_int * 8 Q2NS::Q2::fp1_4 "" - 24 _func___thiscall_int * 8 Q2NS::Q2::fp1_5 "" - 32 _func___thiscall_int_int * 8 Q2NS::Q2::fp1_6 "" - 40 _func___thiscall_int * 8 Q2NS::Q2::fp1_6 "" - 48 _func___thiscall_int * 8 Q2NS::Q2::fp1_7 "" - 56 _func___thiscall_int_int * 8 Q2NS::Q2::fp1_8 "" - 64 _func___thiscall_int * 8 Q2NS::Q2::fp1_8 "" + 0 _func___thiscall_int * 8 R1NS::R1::fp1_3 "" + 8 _func___thiscall_int_int * 8 R1NS::R1::fp1_4 "" + 16 _func___thiscall_int * 8 R1NS::R1::fp1_4 "" + 24 _func___thiscall_int * 8 R1NS::R1::fp1_5 "" + 32 _func___thiscall_int_int * 8 R1NS::R1::fp1_6 "" + 40 _func___thiscall_int * 8 R1NS::R1::fp1_6 "" + 48 _func___thiscall_int * 8 R1NS::R1::fp1_7 "" + 56 _func___thiscall_int_int * 8 R1NS::R1::fp1_8 "" + 64 _func___thiscall_int * 8 R1NS::R1::fp1_8 "" 72 _func___thiscall_int * 8 Q2NS::Q2::fq1_3 "" 80 _func___thiscall_int * 8 Q2NS::Q2::fp2_11 "" 88 _func___thiscall_int_int * 8 Q2NS::Q2::fp2_12 "" - 96 _func___thiscall_int_int * 8 Q2NS::Q2::fq2_3 "" + 96 _func___thiscall_int_int * 8 R1NS::R1::fq2_3 "" } Length: 104 Alignment: 8"""; //@formatter:on @@ -2803,18 +2803,18 @@ public class Vftm64ProgramCreator extends ProgramCreator { /R1NS/R1/!internal/VTABLE_00000050 pack() Structure VTABLE_00000050 { - 0 _func___thiscall_int * 8 P2NS::P2::fp2_3 "" - 8 _func___thiscall_int_int * 8 P2NS::P2::fp2_4 "" - 16 _func___thiscall_int * 8 P2NS::P2::fp2_4 "" - 24 _func___thiscall_int * 8 P2NS::P2::fp2_5 "" - 32 _func___thiscall_int_int * 8 P2NS::P2::fp2_6 "" - 40 _func___thiscall_int * 8 P2NS::P2::fp2_6 "" - 48 _func___thiscall_int * 8 P2NS::P2::fp2_7 "" - 56 _func___thiscall_int_int * 8 P2NS::P2::fp2_8 "" - 64 _func___thiscall_int * 8 P2NS::P2::fp2_8 "" - 72 _func___thiscall_int * 8 P2NS::P2::fp2_9 "" - 80 _func___thiscall_int_int * 8 Q2NS::Q2::fp2_10 "" - 88 _func___thiscall_int * 8 Q2NS::Q2::fp2_10 "" + 0 _func___thiscall_int * 8 R1NS::R1::fp2_3 "" + 8 _func___thiscall_int_int * 8 R1NS::R1::fp2_4 "" + 16 _func___thiscall_int * 8 R1NS::R1::fp2_4 "" + 24 _func___thiscall_int * 8 R1NS::R1::fp2_5 "" + 32 _func___thiscall_int_int * 8 R1NS::R1::fp2_6 "" + 40 _func___thiscall_int * 8 R1NS::R1::fp2_6 "" + 48 _func___thiscall_int * 8 R1NS::R1::fp2_7 "" + 56 _func___thiscall_int_int * 8 R1NS::R1::fp2_8 "" + 64 _func___thiscall_int * 8 R1NS::R1::fp2_8 "" + 72 _func___thiscall_int * 8 R1NS::R1::fp2_9 "" + 80 _func___thiscall_int_int * 8 R1NS::R1::fp2_10 "" + 88 _func___thiscall_int * 8 R1NS::R1::fp2_10 "" } Length: 96 Alignment: 8"""; //@formatter:on