diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/SymbolParser.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/SymbolParser.java index 8373866ca4..840c39f2fa 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/SymbolParser.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/SymbolParser.java @@ -557,12 +557,12 @@ public class SymbolParser { case GlobalProcedureStartIa64StMsSymbol.PDB_ID: symbol = new GlobalProcedureStartIa64StMsSymbol(pdb, reader); break; - case LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol.PDB_ID: - symbol = new LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol(pdb, + case LocalSlotIndexFieldedLILStMsSymbol.PDB_ID: + symbol = new LocalSlotIndexFieldedLILStMsSymbol(pdb, reader); break; - case LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol.PDB_ID: - symbol = new LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol( + case ParameterSlotIndexFieldedLILStMsSymbol.PDB_ID: + symbol = new ParameterSlotIndexFieldedLILStMsSymbol( pdb, reader); break; case AnnotationMsSymbol.PDB_ID: @@ -592,25 +592,25 @@ public class SymbolParser { case GlobalManagedDataStMsSymbol.PDB_ID: symbol = new GlobalManagedDataStMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol.PDB_ID: + case ManLocOrParamReltoVFPStMsSymbol.PDB_ID: symbol = - new ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol(pdb, reader); + new ManLocOrParamReltoVFPStMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterStoredInRegisterStMsSymbol.PDB_ID: - symbol = new ManagedLocalOrParameterStoredInRegisterStMsSymbol(pdb, reader); + case ManagedLocalOrParameterSIRStMsSymbol.PDB_ID: + symbol = new ManagedLocalOrParameterSIRStMsSymbol(pdb, reader); break; case ManagedSymbolWithSlotIndexFieldStMsSymbol.PDB_ID: symbol = new ManagedSymbolWithSlotIndexFieldStMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterStoredInManyRegisterStMsSymbol.PDB_ID: - symbol = new ManagedLocalOrParameterStoredInManyRegisterStMsSymbol(pdb, reader); + case ManagedLocalOrParameterSIMRStMsSymbol.PDB_ID: + symbol = new ManagedLocalOrParameterSIMRStMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol.PDB_ID: - symbol = new ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol(pdb, + case ManLocOrParamReltoAMPStMsSymbol.PDB_ID: + symbol = new ManLocOrParamReltoAMPStMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterStoredInManyRegister2StMsSymbol.PDB_ID: - symbol = new ManagedLocalOrParameterStoredInManyRegister2StMsSymbol(pdb, reader); + case ManagedLocalOrParameterSIMR2StMsSymbol.PDB_ID: + symbol = new ManagedLocalOrParameterSIMR2StMsSymbol(pdb, reader); break; case IndexForTypeReferencedByNameFromMetadataMsSymbol.PDB_ID: symbol = new IndexForTypeReferencedByNameFromMetadataMsSymbol(pdb, reader); @@ -695,12 +695,12 @@ public class SymbolParser { case GlobalProcedureStartIa64MsSymbol.PDB_ID: symbol = new GlobalProcedureStartIa64MsSymbol(pdb, reader); break; - case LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol.PDB_ID: + case LocalSlotIndexFieldedLILMsSymbol.PDB_ID: symbol = - new LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol(pdb, reader); + new LocalSlotIndexFieldedLILMsSymbol(pdb, reader); break; - case LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol.PDB_ID: - symbol = new LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol(pdb, + case ParameterSlotIndexFieldedLILMsSymbol.PDB_ID: + symbol = new ParameterSlotIndexFieldedLILMsSymbol(pdb, reader); break; case LocalManagedDataMsSymbol.PDB_ID: @@ -709,25 +709,25 @@ public class SymbolParser { case GlobalManagedDataMsSymbol.PDB_ID: symbol = new GlobalManagedDataMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.PDB_ID: + case ManLocOrParamReltoVFPMsSymbol.PDB_ID: symbol = - new ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol(pdb, reader); + new ManLocOrParamReltoVFPMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterStoredInRegisterMsSymbol.PDB_ID: - symbol = new ManagedLocalOrParameterStoredInRegisterMsSymbol(pdb, reader); + case ManagedLocalOrParameterSIRMsSymbol.PDB_ID: + symbol = new ManagedLocalOrParameterSIRMsSymbol(pdb, reader); break; case ManagedSymbolWithSlotIndexFieldMsSymbol.PDB_ID: symbol = new ManagedSymbolWithSlotIndexFieldMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterStoredInManyRegisterMsSymbol.PDB_ID: - symbol = new ManagedLocalOrParameterStoredInManyRegisterMsSymbol(pdb, reader); + case ManagedLocalOrParameterSIMRMsSymbol.PDB_ID: + symbol = new ManagedLocalOrParameterSIMRMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.PDB_ID: + case ManLocOrParamReltoAMPMsSymbol.PDB_ID: symbol = - new ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol(pdb, reader); + new ManLocOrParamReltoAMPMsSymbol(pdb, reader); break; - case ManagedLocalOrParameterStoredInManyRegister2MsSymbol.PDB_ID: - symbol = new ManagedLocalOrParameterStoredInManyRegister2MsSymbol(pdb, reader); + case ManagedLocalOrParameterSIMR2MsSymbol.PDB_ID: + symbol = new ManagedLocalOrParameterSIMR2MsSymbol(pdb, reader); break; case UsingNamespaceMsSymbol.PDB_ID: symbol = new UsingNamespaceMsSymbol(pdb, reader); @@ -759,19 +759,19 @@ public class SymbolParser { case ManagedConstantMsSymbol.PDB_ID: symbol = new ManagedConstantMsSymbol(pdb, reader); break; - case AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.PDB_ID: - symbol = new AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol(pdb, + case AttribLocOrParamReltoVFPMsSymbol.PDB_ID: + symbol = new AttribLocOrParamReltoVFPMsSymbol(pdb, reader); break; - case AttributedLocalOrParameterStoredInRegisterMsSymbol.PDB_ID: - symbol = new AttributedLocalOrParameterStoredInRegisterMsSymbol(pdb, reader); + case AttributedLocalOrParameterSIRMsSymbol.PDB_ID: + symbol = new AttributedLocalOrParameterSIRMsSymbol(pdb, reader); break; - case AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.PDB_ID: - symbol = new AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol(pdb, + case AttribLocOrParamReltoAMPMsSymbol.PDB_ID: + symbol = new AttribLocOrParamReltoAMPMsSymbol(pdb, reader); break; - case AttributedLocalOrParameterStoredInManyRegisterMsSymbol.PDB_ID: - symbol = new AttributedLocalOrParameterStoredInManyRegisterMsSymbol(pdb, reader); + case AttributedLocalOrParameterSIMRMsSymbol.PDB_ID: + symbol = new AttributedLocalOrParameterSIMRMsSymbol(pdb, reader); break; case SeparatedCodeFromCompilerSupportMsSymbol.PDB_ID: symbol = new SeparatedCodeFromCompilerSupportMsSymbol(pdb, reader); @@ -815,26 +815,26 @@ public class SymbolParser { case DefinedSingleAddressRangeMsSymbol.PDB_ID: symbol = new DefinedSingleAddressRangeMsSymbol(pdb, reader); break; - case DefinedSingleAddressRangeForSubfieldMsSymbol.PDB_ID: - symbol = new DefinedSingleAddressRangeForSubfieldMsSymbol(pdb, reader); + case SubfieldDARMsSymbol.PDB_ID: + symbol = new SubfieldDARMsSymbol(pdb, reader); break; - case DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol.PDB_ID: - symbol = new DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol(pdb, reader); + case EnregisteredSymbolDARMsSymbol.PDB_ID: + symbol = new EnregisteredSymbolDARMsSymbol(pdb, reader); break; - case DefinedSingleAddressRangeForFramePointerRelativeMsSymbol.PDB_ID: - symbol = new DefinedSingleAddressRangeForFramePointerRelativeMsSymbol(pdb, reader); + case FramePointerRelativeDARMsSymbol.PDB_ID: + symbol = new FramePointerRelativeDARMsSymbol(pdb, reader); break; - case DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol.PDB_ID: + case EnregisteredFieldOfSymbolDARMsSymbol.PDB_ID: symbol = - new DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol(pdb, reader); + new EnregisteredFieldOfSymbolDARMsSymbol(pdb, reader); break; - case DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol.PDB_ID: - symbol = new DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol(pdb, + case FramePointerRelativeFullScopeDARMsSymbol.PDB_ID: + symbol = new FramePointerRelativeFullScopeDARMsSymbol(pdb, reader); break; - case DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol.PDB_ID: + case EnregisteredSymbolRelativeDARMsSymbol.PDB_ID: symbol = - new DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol(pdb, reader); + new EnregisteredSymbolRelativeDARMsSymbol(pdb, reader); break; case LocalProcedure32IdMsSymbol.PDB_ID: symbol = new LocalProcedure32IdMsSymbol(pdb, reader); @@ -866,14 +866,14 @@ public class SymbolParser { case ProcedureIdEndMsSymbol.PDB_ID: symbol = new ProcedureIdEndMsSymbol(pdb, reader); break; - case DefinedAddressRangeHighLevelShaderLanguageMsSymbol.PDB_ID: - symbol = new DefinedAddressRangeHighLevelShaderLanguageMsSymbol(pdb, reader); + case HighLevelShaderLanguageRegDimDARMsSymbol.PDB_ID: + symbol = new HighLevelShaderLanguageRegDimDARMsSymbol(pdb, reader); break; - case GlobalDataHighLevelShaderLanguageMsSymbol.PDB_ID: - symbol = new GlobalDataHighLevelShaderLanguageMsSymbol(pdb, reader); + case GlobalDataHLSLMsSymbol.PDB_ID: + symbol = new GlobalDataHLSLMsSymbol(pdb, reader); break; - case LocalDataHighLevelShaderLanguageMsSymbol.PDB_ID: - symbol = new LocalDataHighLevelShaderLanguageMsSymbol(pdb, reader); + case LocalDataHLSLMsSymbol.PDB_ID: + symbol = new LocalDataHLSLMsSymbol(pdb, reader); break; case FileStaticMsSymbol.PDB_ID: symbol = new FileStaticMsSymbol(pdb, reader); @@ -887,9 +887,9 @@ public class SymbolParser { case LocalProcedure32DeferredProcedureCallIdMsSymbol.PDB_ID: symbol = new LocalProcedure32DeferredProcedureCallIdMsSymbol(pdb, reader); break; - case DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol.PDB_ID: + case DeferredProcedureCallPointerTagRegDimDARMsSymbol.PDB_ID: symbol = - new DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol(pdb, reader); + new DeferredProcedureCallPointerTagRegDimDARMsSymbol(pdb, reader); break; case DeferredProcedureCallPointerTagToSymbolRecordMapMsSymbol.PDB_ID: symbol = new DeferredProcedureCallPointerTagToSymbolRecordMapMsSymbol(pdb, reader); @@ -921,17 +921,17 @@ public class SymbolParser { case MapToMiniPdbMsSymbol.PDB_ID: symbol = new MapToMiniPdbMsSymbol(pdb, reader); break; - case GlobalDataHighLevelShaderLanguage32MsSymbol.PDB_ID: - symbol = new GlobalDataHighLevelShaderLanguage32MsSymbol(pdb, reader); + case GlobalDataHLSL32MsSymbol.PDB_ID: + symbol = new GlobalDataHLSL32MsSymbol(pdb, reader); break; - case LocalDataHighLevelShaderLanguage32MsSymbol.PDB_ID: - symbol = new LocalDataHighLevelShaderLanguage32MsSymbol(pdb, reader); + case LocalDataHLSL32MsSymbol.PDB_ID: + symbol = new LocalDataHLSL32MsSymbol(pdb, reader); break; - case GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol.PDB_ID: - symbol = new GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol(pdb, reader); + case GlobalDataHLSL32ExtMsSymbol.PDB_ID: + symbol = new GlobalDataHLSL32ExtMsSymbol(pdb, reader); break; - case LocalDataHighLevelShaderLanguage32ExtendedMsSymbol.PDB_ID: - symbol = new LocalDataHighLevelShaderLanguage32ExtendedMsSymbol(pdb, reader); + case LocalDataHLSL32ExtMsSymbol.PDB_ID: + symbol = new LocalDataHLSL32ExtMsSymbol(pdb, reader); break; // These should never happen (unless we missed something diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractGlobalDataHighLevelShaderLanguageMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractGlobalDataHLSLMsSymbol.java similarity index 89% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractGlobalDataHighLevelShaderLanguageMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractGlobalDataHLSLMsSymbol.java index fd1e177a28..e4fb50ea2b 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractGlobalDataHighLevelShaderLanguageMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractGlobalDataHLSLMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public abstract class AbstractGlobalDataHighLevelShaderLanguageMsSymbol +public abstract class AbstractGlobalDataHLSLMsSymbol extends AbstractDataHighLevelShaderLanguageMsSymbol { /** @@ -36,7 +36,7 @@ public abstract class AbstractGlobalDataHighLevelShaderLanguageMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AbstractGlobalDataHighLevelShaderLanguageMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public AbstractGlobalDataHLSLMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalDataHighLevelShaderLanguageMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalDataHLSLMsSymbol.java similarity index 89% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalDataHighLevelShaderLanguageMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalDataHLSLMsSymbol.java index 8ad18c617a..eb2e7abfa2 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalDataHighLevelShaderLanguageMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalDataHLSLMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public abstract class AbstractLocalDataHighLevelShaderLanguageMsSymbol +public abstract class AbstractLocalDataHLSLMsSymbol extends AbstractDataHighLevelShaderLanguageMsSymbol { /** @@ -36,7 +36,7 @@ public abstract class AbstractLocalDataHighLevelShaderLanguageMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AbstractLocalDataHighLevelShaderLanguageMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public AbstractLocalDataHLSLMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalSlotIndexFieldedLILMsSymbol.java similarity index 84% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalSlotIndexFieldedLILMsSymbol.java index b41ec98f31..cf8f4226a4 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalSlotIndexFieldedLILMsSymbol.java @@ -26,8 +26,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public abstract class AbstractLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol - extends AbstractLocalIntermediateLanguageSymbolMsSymbol { +public abstract class AbstractLocalSlotIndexFieldedLILMsSymbol + extends LocalIntermediateLanguageSymbol { /** * Constructor for this symbol. @@ -35,7 +35,7 @@ public abstract class AbstractLocalIntermediateLanguageSymbolWithLocalSlotIndexF * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AbstractLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol(AbstractPdb pdb, + public AbstractLocalSlotIndexFieldedLILMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractParameterSlotIndexFieldedLILMsSymbol.java similarity index 84% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractParameterSlotIndexFieldedLILMsSymbol.java index d29bbde39f..296667a7d6 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractParameterSlotIndexFieldedLILMsSymbol.java @@ -26,8 +26,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public abstract class AbstractLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol - extends AbstractLocalIntermediateLanguageSymbolMsSymbol { +public abstract class AbstractParameterSlotIndexFieldedLILMsSymbol + extends LocalIntermediateLanguageSymbol { /** * Constructor for this symbol. @@ -35,7 +35,7 @@ public abstract class AbstractLocalIntermediateLanguageSymbolWithParameterSlotIn * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AbstractLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol( + public AbstractParameterSlotIndexFieldedLILMsSymbol( AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractDefinedAddressRangeWithRegisterDimensionalityMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractRegisterDimensionalityDARMsSymbol.java similarity index 96% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractDefinedAddressRangeWithRegisterDimensionalityMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractRegisterDimensionalityDARMsSymbol.java index 624731c830..83310aac04 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractDefinedAddressRangeWithRegisterDimensionalityMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractRegisterDimensionalityDARMsSymbol.java @@ -29,7 +29,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public abstract class AbstractDefinedAddressRangeWithRegisterDimensionalityMsSymbol +public abstract class AbstractRegisterDimensionalityDARMsSymbol extends AbstractDefinedSingleAddressRangeMsSymbol { public enum MemorySpace { @@ -82,7 +82,7 @@ public abstract class AbstractDefinedAddressRangeWithRegisterDimensionalityMsSym * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public AbstractDefinedAddressRangeWithRegisterDimensionalityMsSymbol(AbstractPdb pdb, + public AbstractRegisterDimensionalityDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttribLocOrParamReltoAMPMsSymbol.java similarity index 90% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttribLocOrParamReltoAMPMsSymbol.java index 6268410ce2..db9c94d65a 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttribLocOrParamReltoAMPMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol +public class AttribLocOrParamReltoAMPMsSymbol extends AbstractManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol { public static final int PDB_ID = 0x1130; @@ -38,7 +38,7 @@ public class AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol(AbstractPdb pdb, + public AttribLocOrParamReltoAMPMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttribLocOrParamReltoVFPMsSymbol.java similarity index 90% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttribLocOrParamReltoVFPMsSymbol.java index 8fcc9d418b..ead6aa6a35 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttribLocOrParamReltoVFPMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol +public class AttribLocOrParamReltoVFPMsSymbol extends AbstractLocalOrParameterRelativeToVirtualFramePointerMsSymbol { public static final int PDB_ID = 0x112e; @@ -38,7 +38,7 @@ public class AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol(AbstractPdb pdb, + public AttribLocOrParamReltoVFPMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterStoredInManyRegisterMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterSIMRMsSymbol.java similarity index 92% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterStoredInManyRegisterMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterSIMRMsSymbol.java index 1481dd8b42..fa0126f47d 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterStoredInManyRegisterMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterSIMRMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class AttributedLocalOrParameterStoredInManyRegisterMsSymbol +public class AttributedLocalOrParameterSIMRMsSymbol extends AbstractManagedLocalOrParameterStoredInManyRegisterMsSymbol { public static final int PDB_ID = 0x1131; @@ -38,7 +38,7 @@ public class AttributedLocalOrParameterStoredInManyRegisterMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AttributedLocalOrParameterStoredInManyRegisterMsSymbol(AbstractPdb pdb, + public AttributedLocalOrParameterSIMRMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterStoredInRegisterMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterSIRMsSymbol.java similarity index 90% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterStoredInRegisterMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterSIRMsSymbol.java index 0df17c9ecc..cfc6a35afa 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterStoredInRegisterMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AttributedLocalOrParameterSIRMsSymbol.java @@ -26,7 +26,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class AttributedLocalOrParameterStoredInRegisterMsSymbol +public class AttributedLocalOrParameterSIRMsSymbol extends AbstractLocalOrParameterStoredInRegisterMsSymbol { public static final int PDB_ID = 0x112f; @@ -37,7 +37,7 @@ public class AttributedLocalOrParameterStoredInRegisterMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AttributedLocalOrParameterStoredInRegisterMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public AttributedLocalOrParameterSIRMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DeferredProcedureCallPointerTagRegDimDARMsSymbol.java similarity index 86% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DeferredProcedureCallPointerTagRegDimDARMsSymbol.java index 559652f334..3f1bf0422e 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DeferredProcedureCallPointerTagRegDimDARMsSymbol.java @@ -25,8 +25,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol - extends AbstractDefinedAddressRangeWithRegisterDimensionalityMsSymbol { +public class DeferredProcedureCallPointerTagRegDimDARMsSymbol + extends AbstractRegisterDimensionalityDARMsSymbol { public static final int PDB_ID = 0x1157; @@ -36,7 +36,7 @@ public class DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol(AbstractPdb pdb, + public DeferredProcedureCallPointerTagRegDimDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredFieldOfSymbolDARMsSymbol.java similarity index 93% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredFieldOfSymbolDARMsSymbol.java index 9ea66270a4..ec4dd4e9e1 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredFieldOfSymbolDARMsSymbol.java @@ -25,7 +25,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol +public class EnregisteredFieldOfSymbolDARMsSymbol extends AbstractDefinedSingleAddressRangeMsSymbol { public static final int PDB_ID = 0x1143; @@ -41,7 +41,7 @@ public class DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol(AbstractPdb pdb, + public EnregisteredFieldOfSymbolDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredSymbolDARMsSymbol.java similarity index 93% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredSymbolDARMsSymbol.java index fa9d044dfe..c6e3e74e95 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredSymbolDARMsSymbol.java @@ -25,7 +25,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol +public class EnregisteredSymbolDARMsSymbol extends AbstractDefinedSingleAddressRangeMsSymbol { public static final int PDB_ID = 0x1141; @@ -40,7 +40,7 @@ public class DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol(AbstractPdb pdb, + public EnregisteredSymbolDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredSymbolRelativeDARMsSymbol.java similarity index 94% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredSymbolRelativeDARMsSymbol.java index f149aa9672..9965b6f5ae 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/EnregisteredSymbolRelativeDARMsSymbol.java @@ -25,7 +25,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol +public class EnregisteredSymbolRelativeDARMsSymbol extends AbstractDefinedSingleAddressRangeMsSymbol { public static final int PDB_ID = 0x1145; @@ -42,7 +42,7 @@ public class DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol(AbstractPdb pdb, + public EnregisteredSymbolRelativeDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForFramePointerRelativeMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/FramePointerRelativeDARMsSymbol.java similarity index 92% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForFramePointerRelativeMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/FramePointerRelativeDARMsSymbol.java index 3e77921a01..49cf3e24fd 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForFramePointerRelativeMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/FramePointerRelativeDARMsSymbol.java @@ -25,7 +25,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class DefinedSingleAddressRangeForFramePointerRelativeMsSymbol +public class FramePointerRelativeDARMsSymbol extends AbstractDefinedSingleAddressRangeMsSymbol { public static final int PDB_ID = 0x1142; @@ -38,7 +38,7 @@ public class DefinedSingleAddressRangeForFramePointerRelativeMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public DefinedSingleAddressRangeForFramePointerRelativeMsSymbol(AbstractPdb pdb, + public FramePointerRelativeDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/FramePointerRelativeFullScopeDARMsSymbol.java similarity index 92% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/FramePointerRelativeFullScopeDARMsSymbol.java index a9e6664b0f..7e080bfc41 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/FramePointerRelativeFullScopeDARMsSymbol.java @@ -26,7 +26,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol +public class FramePointerRelativeFullScopeDARMsSymbol extends AbstractDefinedSingleAddressRangeMsSymbol { public static final int PDB_ID = 0x1144; @@ -39,7 +39,7 @@ public class DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol(AbstractPdb pdb, + public FramePointerRelativeFullScopeDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSL32ExtMsSymbol.java similarity index 89% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSL32ExtMsSymbol.java index 042ebaad82..67e537a2aa 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSL32ExtMsSymbol.java @@ -28,8 +28,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol - extends AbstractGlobalDataHighLevelShaderLanguageMsSymbol { +public class GlobalDataHLSL32ExtMsSymbol + extends AbstractGlobalDataHLSLMsSymbol { public static final int PDB_ID = 0x1164; @@ -39,7 +39,7 @@ public class GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol(AbstractPdb pdb, + public GlobalDataHLSL32ExtMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguage32MsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSL32MsSymbol.java similarity index 88% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguage32MsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSL32MsSymbol.java index 60d540a9e2..58e08fdced 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguage32MsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSL32MsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class GlobalDataHighLevelShaderLanguage32MsSymbol - extends AbstractGlobalDataHighLevelShaderLanguageMsSymbol { +public class GlobalDataHLSL32MsSymbol + extends AbstractGlobalDataHLSLMsSymbol { public static final int PDB_ID = 0x1162; @@ -38,7 +38,7 @@ public class GlobalDataHighLevelShaderLanguage32MsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public GlobalDataHighLevelShaderLanguage32MsSymbol(AbstractPdb pdb, PdbByteReader reader) + public GlobalDataHLSL32MsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguageMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSLMsSymbol.java similarity index 88% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguageMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSLMsSymbol.java index 5ec0b523f8..86909e884f 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHighLevelShaderLanguageMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/GlobalDataHLSLMsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class GlobalDataHighLevelShaderLanguageMsSymbol - extends AbstractGlobalDataHighLevelShaderLanguageMsSymbol { +public class GlobalDataHLSLMsSymbol + extends AbstractGlobalDataHLSLMsSymbol { public static final int PDB_ID = 0x1151; @@ -38,7 +38,7 @@ public class GlobalDataHighLevelShaderLanguageMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public GlobalDataHighLevelShaderLanguageMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public GlobalDataHLSLMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedAddressRangeHighLevelShaderLanguageMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/HighLevelShaderLanguageRegDimDARMsSymbol.java similarity index 86% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedAddressRangeHighLevelShaderLanguageMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/HighLevelShaderLanguageRegDimDARMsSymbol.java index 7497da1ad7..7b76be67de 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedAddressRangeHighLevelShaderLanguageMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/HighLevelShaderLanguageRegDimDARMsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class DefinedAddressRangeHighLevelShaderLanguageMsSymbol - extends AbstractDefinedAddressRangeWithRegisterDimensionalityMsSymbol { +public class HighLevelShaderLanguageRegDimDARMsSymbol + extends AbstractRegisterDimensionalityDARMsSymbol { public static final int PDB_ID = 0x1150; @@ -38,7 +38,7 @@ public class DefinedAddressRangeHighLevelShaderLanguageMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public DefinedAddressRangeHighLevelShaderLanguageMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public HighLevelShaderLanguageRegDimDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguage32ExtendedMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSL32ExtMsSymbol.java similarity index 88% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguage32ExtendedMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSL32ExtMsSymbol.java index b34bf33058..713fce0bf7 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguage32ExtendedMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSL32ExtMsSymbol.java @@ -28,8 +28,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class LocalDataHighLevelShaderLanguage32ExtendedMsSymbol - extends AbstractLocalDataHighLevelShaderLanguageMsSymbol { +public class LocalDataHLSL32ExtMsSymbol + extends AbstractLocalDataHLSLMsSymbol { public static final int PDB_ID = 0x1165; @@ -39,7 +39,7 @@ public class LocalDataHighLevelShaderLanguage32ExtendedMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public LocalDataHighLevelShaderLanguage32ExtendedMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public LocalDataHLSL32ExtMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguage32MsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSL32MsSymbol.java similarity index 88% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguage32MsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSL32MsSymbol.java index a8154704e3..5e5a695b59 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguage32MsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSL32MsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class LocalDataHighLevelShaderLanguage32MsSymbol - extends AbstractLocalDataHighLevelShaderLanguageMsSymbol { +public class LocalDataHLSL32MsSymbol + extends AbstractLocalDataHLSLMsSymbol { public static final int PDB_ID = 0x1163; @@ -38,7 +38,7 @@ public class LocalDataHighLevelShaderLanguage32MsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public LocalDataHighLevelShaderLanguage32MsSymbol(AbstractPdb pdb, PdbByteReader reader) + public LocalDataHLSL32MsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguageMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSLMsSymbol.java similarity index 88% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguageMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSLMsSymbol.java index 4d715a775e..35e4bdb3a0 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHighLevelShaderLanguageMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalDataHLSLMsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class LocalDataHighLevelShaderLanguageMsSymbol - extends AbstractLocalDataHighLevelShaderLanguageMsSymbol { +public class LocalDataHLSLMsSymbol + extends AbstractLocalDataHLSLMsSymbol { public static final int PDB_ID = 0x1152; @@ -38,7 +38,7 @@ public class LocalDataHighLevelShaderLanguageMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public LocalDataHighLevelShaderLanguageMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public LocalDataHLSLMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbol.java similarity index 90% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbol.java index a60d97c5aa..aad118d4dd 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/AbstractLocalIntermediateLanguageSymbolMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbol.java @@ -25,7 +25,7 @@ import ghidra.pdb.pdbreader.*; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public abstract class AbstractLocalIntermediateLanguageSymbolMsSymbol extends AbstractMsSymbol { +public abstract class LocalIntermediateLanguageSymbol extends AbstractMsSymbol { protected long slotIndex; protected int typeIndex; @@ -37,7 +37,7 @@ public abstract class AbstractLocalIntermediateLanguageSymbolMsSymbol extends Ab * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public AbstractLocalIntermediateLanguageSymbolMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public LocalIntermediateLanguageSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); create(); diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalSlotIndexFieldedLILMsSymbol.java similarity index 86% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalSlotIndexFieldedLILMsSymbol.java index 9154938202..1a5013634f 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalSlotIndexFieldedLILMsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol - extends AbstractLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol { +public class LocalSlotIndexFieldedLILMsSymbol + extends AbstractLocalSlotIndexFieldedLILMsSymbol { public static final int PDB_ID = 0x111a; @@ -38,7 +38,7 @@ public class LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol(AbstractPdb pdb, + public LocalSlotIndexFieldedLILMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalSlotIndexFieldedLILStMsSymbol.java similarity index 86% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalSlotIndexFieldedLILStMsSymbol.java index e94891a2a8..170326272d 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalSlotIndexFieldedLILStMsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.StringUtf8St; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol - extends AbstractLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol { +public class LocalSlotIndexFieldedLILStMsSymbol + extends AbstractLocalSlotIndexFieldedLILMsSymbol { public static final int PDB_ID = 0x1017; @@ -38,7 +38,7 @@ public class LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol(AbstractPdb pdb, + public LocalSlotIndexFieldedLILStMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoAMPMsSymbol.java similarity index 91% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoAMPMsSymbol.java index e37f08aa18..690604e357 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoAMPMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol +public class ManLocOrParamReltoAMPMsSymbol extends AbstractManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol { public static final int PDB_ID = 0x1122; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol(AbstractPdb pdb, + public ManLocOrParamReltoAMPMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoAMPStMsSymbol.java similarity index 90% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoAMPStMsSymbol.java index 4f746ff8e8..ff560991d4 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoAMPStMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8St; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol +public class ManLocOrParamReltoAMPStMsSymbol extends AbstractManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol { public static final int PDB_ID = 0x1026; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol(AbstractPdb pdb, + public ManLocOrParamReltoAMPStMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoVFPMsSymbol.java similarity index 91% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoVFPMsSymbol.java index bc4fc6172e..b854bbd22f 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoVFPMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol +public class ManLocOrParamReltoVFPMsSymbol extends AbstractLocalOrParameterRelativeToVirtualFramePointerMsSymbol { public static final int PDB_ID = 0x111e; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol(AbstractPdb pdb, + public ManLocOrParamReltoVFPMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoVFPStMsSymbol.java similarity index 91% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoVFPStMsSymbol.java index 4d8cda0064..8d9b9eb0c2 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManLocOrParamReltoVFPStMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8St; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol +public class ManLocOrParamReltoVFPStMsSymbol extends AbstractLocalOrParameterRelativeToVirtualFramePointerMsSymbol { public static final int PDB_ID = 0x1022; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol(AbstractPdb pdb, + public ManLocOrParamReltoVFPStMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegister2MsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMR2MsSymbol.java similarity index 92% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegister2MsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMR2MsSymbol.java index f362425a59..f017dfb2a3 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegister2MsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMR2MsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterStoredInManyRegister2MsSymbol +public class ManagedLocalOrParameterSIMR2MsSymbol extends AbstractManagedLocalOrParameterStoredInManyRegisterMsSymbol { public static final int PDB_ID = 0x1123; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterStoredInManyRegister2MsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterStoredInManyRegister2MsSymbol(AbstractPdb pdb, + public ManagedLocalOrParameterSIMR2MsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegister2StMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMR2StMsSymbol.java similarity index 92% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegister2StMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMR2StMsSymbol.java index ac857938f5..34bc0f88d1 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegister2StMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMR2StMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8St; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterStoredInManyRegister2StMsSymbol +public class ManagedLocalOrParameterSIMR2StMsSymbol extends AbstractManagedLocalOrParameterStoredInManyRegisterMsSymbol { public static final int PDB_ID = 0x1027; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterStoredInManyRegister2StMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterStoredInManyRegister2StMsSymbol(AbstractPdb pdb, + public ManagedLocalOrParameterSIMR2StMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegisterMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMRMsSymbol.java similarity index 92% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegisterMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMRMsSymbol.java index 39c9926bbb..129fbee92e 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegisterMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMRMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterStoredInManyRegisterMsSymbol +public class ManagedLocalOrParameterSIMRMsSymbol extends AbstractManagedLocalOrParameterStoredInManyRegisterMsSymbol { public static final int PDB_ID = 0x1121; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterStoredInManyRegisterMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterStoredInManyRegisterMsSymbol(AbstractPdb pdb, + public ManagedLocalOrParameterSIMRMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegisterStMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMRStMsSymbol.java similarity index 92% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegisterStMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMRStMsSymbol.java index 88fc01086e..ac597514a9 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInManyRegisterStMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIMRStMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8St; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterStoredInManyRegisterStMsSymbol +public class ManagedLocalOrParameterSIMRStMsSymbol extends AbstractManagedLocalOrParameterStoredInManyRegisterMsSymbol { public static final int PDB_ID = 0x1025; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterStoredInManyRegisterStMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterStoredInManyRegisterStMsSymbol(AbstractPdb pdb, + public ManagedLocalOrParameterSIMRStMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInRegisterMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIRMsSymbol.java similarity index 91% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInRegisterMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIRMsSymbol.java index cf0c1301b1..126db98855 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInRegisterMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIRMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterStoredInRegisterMsSymbol +public class ManagedLocalOrParameterSIRMsSymbol extends AbstractLocalOrParameterStoredInRegisterMsSymbol { public static final int PDB_ID = 0x111f; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterStoredInRegisterMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterStoredInRegisterMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public ManagedLocalOrParameterSIRMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInRegisterStMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIRStMsSymbol.java similarity index 91% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInRegisterStMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIRStMsSymbol.java index 1f80da6d34..b606406151 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterStoredInRegisterStMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ManagedLocalOrParameterSIRStMsSymbol.java @@ -27,7 +27,7 @@ import ghidra.pdb.pdbreader.StringUtf8St; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class ManagedLocalOrParameterStoredInRegisterStMsSymbol +public class ManagedLocalOrParameterSIRStMsSymbol extends AbstractLocalOrParameterStoredInRegisterMsSymbol { public static final int PDB_ID = 0x1023; @@ -38,7 +38,7 @@ public class ManagedLocalOrParameterStoredInRegisterStMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public ManagedLocalOrParameterStoredInRegisterStMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public ManagedLocalOrParameterSIRStMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ParameterSlotIndexFieldedLILMsSymbol.java similarity index 86% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ParameterSlotIndexFieldedLILMsSymbol.java index 98ed8b04be..3ad7690337 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ParameterSlotIndexFieldedLILMsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.StringUtf8Nt; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol - extends AbstractLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol { +public class ParameterSlotIndexFieldedLILMsSymbol + extends AbstractParameterSlotIndexFieldedLILMsSymbol { public static final int PDB_ID = 0x111b; @@ -38,7 +38,7 @@ public class LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol(AbstractPdb pdb, + public ParameterSlotIndexFieldedLILMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ParameterSlotIndexFieldedLILStMsSymbol.java similarity index 86% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ParameterSlotIndexFieldedLILStMsSymbol.java index a646d0f7b0..dde34b0190 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/ParameterSlotIndexFieldedLILStMsSymbol.java @@ -27,8 +27,8 @@ import ghidra.pdb.pdbreader.StringUtf8St; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol - extends AbstractLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol { +public class ParameterSlotIndexFieldedLILStMsSymbol + extends AbstractParameterSlotIndexFieldedLILMsSymbol { public static final int PDB_ID = 0x1018; @@ -38,7 +38,7 @@ public class LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbo * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException upon error parsing a field. */ - public LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol(AbstractPdb pdb, + public ParameterSlotIndexFieldedLILStMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForSubfieldMsSymbol.java b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/SubfieldDARMsSymbol.java similarity index 93% rename from Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForSubfieldMsSymbol.java rename to Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/SubfieldDARMsSymbol.java index 5d7d994819..a8571f4f82 100644 --- a/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/DefinedSingleAddressRangeForSubfieldMsSymbol.java +++ b/Ghidra/Features/PDB/src/main/java/ghidra/pdb/pdbreader/symbol/SubfieldDARMsSymbol.java @@ -25,7 +25,7 @@ import ghidra.pdb.pdbreader.AbstractPdb; * Note: we do not necessarily understand each of these symbol type classes. Refer to the * base class for more information. */ -public class DefinedSingleAddressRangeForSubfieldMsSymbol +public class SubfieldDARMsSymbol extends AbstractDefinedSingleAddressRangeMsSymbol { public static final int PDB_ID = 0x1140; @@ -39,7 +39,7 @@ public class DefinedSingleAddressRangeForSubfieldMsSymbol * @param reader {@link PdbByteReader} from which this symbol is deserialized. * @throws PdbException Upon not enough data left to parse. */ - public DefinedSingleAddressRangeForSubfieldMsSymbol(AbstractPdb pdb, PdbByteReader reader) + public SubfieldDARMsSymbol(AbstractPdb pdb, PdbByteReader reader) throws PdbException { super(pdb, reader); } diff --git a/Ghidra/Features/PDB/src/test/java/ghidra/pdb/pdbreader/symbol/SymbolsTest.java b/Ghidra/Features/PDB/src/test/java/ghidra/pdb/pdbreader/symbol/SymbolsTest.java index 066b272fde..134d72bc7a 100644 --- a/Ghidra/Features/PDB/src/test/java/ghidra/pdb/pdbreader/symbol/SymbolsTest.java +++ b/Ghidra/Features/PDB/src/test/java/ghidra/pdb/pdbreader/symbol/SymbolsTest.java @@ -1175,9 +1175,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testLocalDataHighLevelShaderLanguageMsSymbol() throws PdbException { + public void testLocalDataHLSLMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(LocalDataHighLevelShaderLanguageMsSymbol.PDB_ID); + writer.putUnsignedShort(LocalDataHLSLMsSymbol.PDB_ID); writer.putInt(4096); // Type index writer.putUnsignedShort(0x01); // HLSL register type writer.putUnsignedShort(0x02); // Base data slot @@ -1188,7 +1188,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("LocalDataHighLevelShaderLanguageSymbolName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof LocalDataHighLevelShaderLanguageMsSymbol, true); + assertEquals(symbol instanceof LocalDataHLSLMsSymbol, true); String result = symbol.toString().trim(); assertEquals("LDATA_HLSL: Type: DummyMsType. INPUT\n" + " base data: slot = 2 offset = 3, texture slot = 4, sampler slot = 5," + @@ -1196,9 +1196,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testLocalDataHighLevelShaderLanguage32MsSymbol() throws PdbException { + public void testLocalDataHLSL32MsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(LocalDataHighLevelShaderLanguage32MsSymbol.PDB_ID); + writer.putUnsignedShort(LocalDataHLSL32MsSymbol.PDB_ID); writer.putInt(4096); // Type index writer.putUnsignedInt(0x02); // Base data slot writer.putUnsignedInt(0x03); // Base data byte offset start @@ -1209,7 +1209,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("LocalDataHighLevelShaderLanguageSymbolName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof LocalDataHighLevelShaderLanguage32MsSymbol, true); + assertEquals(symbol instanceof LocalDataHLSL32MsSymbol, true); String result = symbol.toString().trim(); assertEquals("LDATA_HLSL32: Type: DummyMsType. INPUT\n" + " base data: slot = 2 offset = 3, texture slot = 4, sampler slot = 5," + @@ -1217,9 +1217,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testLocalDataHighLevelShaderLanguage32ExtendedMsSymbol() throws PdbException { + public void testLocalDataHLSL32ExtMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(LocalDataHighLevelShaderLanguage32ExtendedMsSymbol.PDB_ID); + writer.putUnsignedShort(LocalDataHLSL32ExtMsSymbol.PDB_ID); writer.putInt(4096); // Type index writer.putUnsignedInt(0x02); // HLSL register index (regID) writer.putUnsignedInt(0x03); // Base data byte offset start @@ -1229,7 +1229,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("LocalDataHighLevelShaderLanguageSymbolName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof LocalDataHighLevelShaderLanguage32ExtendedMsSymbol, true); + assertEquals(symbol instanceof LocalDataHLSL32ExtMsSymbol, true); String result = symbol.toString().trim(); assertEquals("LDATA_HLSL32_EX: Type: DummyMsType. INPUT\n" + " register index = 2, base data offset start = 3, bind space = 4," + " bind slot = 5", @@ -1237,9 +1237,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testGlobalDataHighLevelShaderLanguageMsSymbol() throws PdbException { + public void testGlobalDataHLSLMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(GlobalDataHighLevelShaderLanguageMsSymbol.PDB_ID); + writer.putUnsignedShort(GlobalDataHLSLMsSymbol.PDB_ID); writer.putInt(4096); // Type index writer.putUnsignedShort(0x01); // HLSL register type writer.putUnsignedShort(0x02); // Base data slot @@ -1250,7 +1250,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("GlobalDataHighLevelShaderLanguageSymbolName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof GlobalDataHighLevelShaderLanguageMsSymbol, true); + assertEquals(symbol instanceof GlobalDataHLSLMsSymbol, true); String result = symbol.toString().trim(); assertEquals("GDATA_HLSL: Type: DummyMsType. INPUT\n" + " base data: slot = 2 offset = 3, texture slot = 4, sampler slot = 5," + @@ -1258,9 +1258,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testGlobalDataHighLevelShaderLanguage32MsSymbol() throws PdbException { + public void testGlobalDataHLSL32MsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(GlobalDataHighLevelShaderLanguage32MsSymbol.PDB_ID); + writer.putUnsignedShort(GlobalDataHLSL32MsSymbol.PDB_ID); writer.putInt(4096); // Type index writer.putUnsignedInt(0x02); // Base data slot writer.putUnsignedInt(0x03); // Base data byte offset start @@ -1271,7 +1271,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("GlobalDataHighLevelShaderLanguageSymbolName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof GlobalDataHighLevelShaderLanguage32MsSymbol, true); + assertEquals(symbol instanceof GlobalDataHLSL32MsSymbol, true); String result = symbol.toString().trim(); assertEquals("GDATA_HLSL32: Type: DummyMsType. INPUT\n" + " base data: slot = 2 offset = 3, texture slot = 4, sampler slot = 5," + @@ -1279,9 +1279,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testGlobalDataHighLevelShaderLanguage32ExtendedMsSymbol() throws PdbException { + public void testGlobalDataHLSL32ExtMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol.PDB_ID); + writer.putUnsignedShort(GlobalDataHLSL32ExtMsSymbol.PDB_ID); writer.putInt(4096); // Type index writer.putUnsignedInt(0x02); // HLSL register index (regID) writer.putUnsignedInt(0x03); // Base data byte offset start @@ -1291,7 +1291,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("GlobalDataHighLevelShaderLanguageSymbolName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof GlobalDataHighLevelShaderLanguage32ExtendedMsSymbol, true); + assertEquals(symbol instanceof GlobalDataHLSL32ExtMsSymbol, true); String result = symbol.toString().trim(); assertEquals("GDATA_HLSL32_EX: Type: DummyMsType. INPUT\n" + " register index = 2, base data offset start = 3, bind space = 4," + " bind slot = 5", @@ -2612,71 +2612,71 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol() + public void testLocalSlotIndexFieldedLILStMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol.PDB_ID); + LocalSlotIndexFieldedLILStMsSymbol.PDB_ID); writer.putUnsignedInt(0x10); // slot index writer.putInt(4096); // type index or metadata token writer.putByteLengthPrefixedUtf8String("LocalSlotName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldStMsSymbol, + symbol instanceof LocalSlotIndexFieldedLILStMsSymbol, true); String result = symbol.toString().trim(); assertEquals("LOCALSLOT_ST: [00000010], Type: DummyMsType, LocalSlotName", result); } @Test - public void testLocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol() + public void testLocalSlotIndexFieldedLILMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol.PDB_ID); + LocalSlotIndexFieldedLILMsSymbol.PDB_ID); writer.putUnsignedInt(0x10); // slot index writer.putInt(4096); // type index or metadata token writer.putNullTerminatedUtf8String("LocalSlotName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof LocalIntermediateLanguageSymbolWithLocalSlotIndexFieldMsSymbol, true); + symbol instanceof LocalSlotIndexFieldedLILMsSymbol, true); String result = symbol.toString().trim(); assertEquals("LOCALSLOT: [00000010], Type: DummyMsType, LocalSlotName", result); } @Test - public void testLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol() + public void testParameterSlotIndexFieldedLILStMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol.PDB_ID); + ParameterSlotIndexFieldedLILStMsSymbol.PDB_ID); writer.putUnsignedInt(0x10); // slot index writer.putInt(4096); // type index or metadata token writer.putByteLengthPrefixedUtf8String("ParamSlotName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldStMsSymbol, + symbol instanceof ParameterSlotIndexFieldedLILStMsSymbol, true); String result = symbol.toString().trim(); assertEquals("PARAMSLOT_ST: [00000010], Type: DummyMsType, ParamSlotName", result); } @Test - public void testLocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol() + public void testParameterSlotIndexFieldedLILMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol.PDB_ID); + ParameterSlotIndexFieldedLILMsSymbol.PDB_ID); writer.putUnsignedInt(0x10); // slot index writer.putInt(4096); // type index or metadata token writer.putNullTerminatedUtf8String("ParamSlotName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof LocalIntermediateLanguageSymbolWithParameterSlotIndexFieldMsSymbol, + symbol instanceof ParameterSlotIndexFieldedLILMsSymbol, true); String result = symbol.toString().trim(); assertEquals("PARAMSLOT: [00000010], Type: DummyMsType, ParamSlotName", result); @@ -2865,11 +2865,11 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol() + public void testManLocOrParamReltoVFPStMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol.PDB_ID); + ManLocOrParamReltoVFPStMsSymbol.PDB_ID); writer.putUnsignedInt(0x3000); // Frame-relative offset writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, @@ -2880,7 +2880,7 @@ public class SymbolsTest extends AbstractGenericTest { PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof ManagedLocalOrParameterRelativeToVirtualFramePointerStMsSymbol, true); + symbol instanceof ManLocOrParamReltoVFPStMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANFRAMEREL_ST: [00003000], [0001:00001000]: Param: 4096 Address Taken," + " Compiler Generated, aggregate, aggregated, aliased, alias, return value," + @@ -2888,11 +2888,11 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol() + public void testManLocOrParamReltoVFPMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.PDB_ID); + ManLocOrParamReltoVFPMsSymbol.PDB_ID); writer.putUnsignedInt(0x3000); // Frame-relative offset writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, @@ -2902,7 +2902,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("ManagedFrameName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof ManagedLocalOrParameterRelativeToVirtualFramePointerMsSymbol, + assertEquals(symbol instanceof ManLocOrParamReltoVFPMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANFRAMEREL: [00003000], [0001:00001000]: Param: 4096 Address Taken," + @@ -2911,11 +2911,11 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testAttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol() + public void testAttribLocOrParamReltoVFPMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol.PDB_ID); + AttribLocOrParamReltoVFPMsSymbol.PDB_ID); writer.putUnsignedInt(0x3000); // Frame-relative offset writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, @@ -2926,7 +2926,7 @@ public class SymbolsTest extends AbstractGenericTest { PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof AttributedLocalOrParameterRelativeToVirtualFramePointerMsSymbol, + symbol instanceof AttribLocOrParamReltoVFPMsSymbol, true); String result = symbol.toString().trim(); assertEquals("ATTR_MANFRAMEREL: [00003000], [0001:00001000]: Param: 4096 Address Taken," + @@ -2935,9 +2935,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testManagedLocalOrParameterStoredInRegisterStMsSymbol() throws PdbException { + public void testManagedLocalOrParameterSIRStMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(ManagedLocalOrParameterStoredInRegisterStMsSymbol.PDB_ID); + writer.putUnsignedShort(ManagedLocalOrParameterSIRStMsSymbol.PDB_ID); writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, true, true, true, true, true); @@ -2947,7 +2947,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putByteLengthPrefixedUtf8String("ManagedRegisterName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof ManagedLocalOrParameterStoredInRegisterStMsSymbol, true); + assertEquals(symbol instanceof ManagedLocalOrParameterSIRStMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANREGISTER_ST: al, [0001:00001000]: Param: 4096 Address Taken," + " Compiler Generated, aggregate, aggregated, aliased, alias, return value," + @@ -2955,9 +2955,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testManagedLocalOrParameterStoredInRegisterMsSymbol() throws PdbException { + public void testManagedLocalOrParameterSIRMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(ManagedLocalOrParameterStoredInRegisterMsSymbol.PDB_ID); + writer.putUnsignedShort(ManagedLocalOrParameterSIRMsSymbol.PDB_ID); writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, true, true, true, true, true); @@ -2967,7 +2967,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("ManagedRegisterName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof ManagedLocalOrParameterStoredInRegisterMsSymbol, true); + assertEquals(symbol instanceof ManagedLocalOrParameterSIRMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANREGISTER: al, [0001:00001000]: Param: 4096 Address Taken," + " Compiler Generated, aggregate, aggregated, aliased, alias, return value," + @@ -2975,9 +2975,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testAttributedLocalOrParameterStoredInRegisterMsSymbol() throws PdbException { + public void testAttributedLocalOrParameterSIRMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(AttributedLocalOrParameterStoredInRegisterMsSymbol.PDB_ID); + writer.putUnsignedShort(AttributedLocalOrParameterSIRMsSymbol.PDB_ID); writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, true, true, true, true, true); @@ -2987,7 +2987,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("AttributedRegisterName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof AttributedLocalOrParameterStoredInRegisterMsSymbol, true); + assertEquals(symbol instanceof AttributedLocalOrParameterSIRMsSymbol, true); String result = symbol.toString().trim(); assertEquals("ATTR_REGISTER: al, [0001:00001000]: Param: 4096 Address Taken," + " Compiler Generated, aggregate, aggregated, aliased, alias, return value," + @@ -3035,9 +3035,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testManagedLocalOrParameterStoredInManyRegisterStMsSymbol() throws PdbException { + public void testManagedLocalOrParameterSIMRStMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(ManagedLocalOrParameterStoredInManyRegisterStMsSymbol.PDB_ID); + writer.putUnsignedShort(ManagedLocalOrParameterSIMRStMsSymbol.PDB_ID); writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, true, true, true, true, true); @@ -3050,15 +3050,15 @@ public class SymbolsTest extends AbstractGenericTest { writer.putByteLengthPrefixedUtf8String("ManagedManyRegisterName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof ManagedLocalOrParameterStoredInManyRegisterStMsSymbol, true); + assertEquals(symbol instanceof ManagedLocalOrParameterSIMRStMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANMANYREG_ST: al, cl, dl DummyMsType ManagedManyRegisterName", result); } @Test - public void testManagedLocalOrParameterStoredInManyRegisterMsSymbol() throws PdbException { + public void testManagedLocalOrParameterSIMRMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(ManagedLocalOrParameterStoredInManyRegisterMsSymbol.PDB_ID); + writer.putUnsignedShort(ManagedLocalOrParameterSIMRMsSymbol.PDB_ID); writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, true, true, true, true, true); @@ -3071,15 +3071,15 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("ManagedManyRegisterName"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof ManagedLocalOrParameterStoredInManyRegisterMsSymbol, true); + assertEquals(symbol instanceof ManagedLocalOrParameterSIMRMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANMANYREG: al, cl, dl DummyMsType ManagedManyRegisterName", result); } @Test - public void testManagedLocalOrParameterStoredInManyRegister2StMsSymbol() throws PdbException { + public void testManagedLocalOrParameterSIMR2StMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(ManagedLocalOrParameterStoredInManyRegister2StMsSymbol.PDB_ID); + writer.putUnsignedShort(ManagedLocalOrParameterSIMR2StMsSymbol.PDB_ID); writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, true, true, true, true, true); @@ -3092,16 +3092,16 @@ public class SymbolsTest extends AbstractGenericTest { writer.putByteLengthPrefixedUtf8String("ManagedManyRegister2Name"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof ManagedLocalOrParameterStoredInManyRegister2StMsSymbol, + assertEquals(symbol instanceof ManagedLocalOrParameterSIMR2StMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANMANYREG2_ST: al, cl, dl DummyMsType ManagedManyRegister2Name", result); } @Test - public void testManagedLocalOrParameterStoredInManyRegister2MsSymbol() throws PdbException { + public void testManagedLocalOrParameterSIMR2MsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(ManagedLocalOrParameterStoredInManyRegister2MsSymbol.PDB_ID); + writer.putUnsignedShort(ManagedLocalOrParameterSIMR2MsSymbol.PDB_ID); writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, true, true, true, true, true); @@ -3114,15 +3114,15 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("ManagedManyRegister2Name"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof ManagedLocalOrParameterStoredInManyRegister2MsSymbol, true); + assertEquals(symbol instanceof ManagedLocalOrParameterSIMR2MsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANMANYREG2: al, cl, dl DummyMsType ManagedManyRegister2Name", result); } @Test - public void testAttributedLocalOrParameterStoredInManyRegisterMsSymbol() throws PdbException { + public void testAttributedLocalOrParameterSIMRMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(AttributedLocalOrParameterStoredInManyRegisterMsSymbol.PDB_ID); + writer.putUnsignedShort(AttributedLocalOrParameterSIMRMsSymbol.PDB_ID); writer.putInt(4096); // type index or mdatadata token byte[] localVarFlags = createLocalVariableFlagsBuffer(true, true, true, true, true, true, true, true, true, true, true); @@ -3135,18 +3135,18 @@ public class SymbolsTest extends AbstractGenericTest { writer.putNullTerminatedUtf8String("ManagedManyRegister2Name"); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof AttributedLocalOrParameterStoredInManyRegisterMsSymbol, + assertEquals(symbol instanceof AttributedLocalOrParameterSIMRMsSymbol, true); String result = symbol.toString().trim(); assertEquals("ATTR_MANYREG: al, cl, dl DummyMsType ManagedManyRegister2Name", result); } @Test - public void testManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol() + public void testManLocOrParamReltoAMPStMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol.PDB_ID); + ManLocOrParamReltoAMPStMsSymbol.PDB_ID); writer.putUnsignedInt(0x3000); // Frame-relative offset writer.putInt(4096); // type index or mdatadata token writer.putUnsignedShort(1); // Register index @@ -3158,7 +3158,7 @@ public class SymbolsTest extends AbstractGenericTest { PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof ManagedLocalOrParameterRelativeToAlternateFramePointerStMsSymbol, + symbol instanceof ManLocOrParamReltoAMPStMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANREGREL_ST: al+00003000, [0001:00001000]: Param: 4096 Address Taken," + @@ -3167,11 +3167,11 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol() + public void testManLocOrParamReltoAMPMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.PDB_ID); + ManLocOrParamReltoAMPMsSymbol.PDB_ID); writer.putUnsignedInt(0x3000); // Frame-relative offset writer.putInt(4096); // type index or mdatadata token writer.putUnsignedShort(1); // Register index @@ -3183,7 +3183,7 @@ public class SymbolsTest extends AbstractGenericTest { PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof ManagedLocalOrParameterRelativeToAlternateFramePointerMsSymbol, true); + symbol instanceof ManLocOrParamReltoAMPMsSymbol, true); String result = symbol.toString().trim(); assertEquals("MANREGREL: al+00003000, [0001:00001000]: Param: 4096 Address Taken," + " Compiler Generated, aggregate, aggregated, aliased, alias, return value," + @@ -3191,11 +3191,11 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testAttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol() + public void testAttribLocOrParamReltoAMPMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol.PDB_ID); + AttribLocOrParamReltoAMPMsSymbol.PDB_ID); writer.putUnsignedInt(0x3000); // Frame-relative offset writer.putInt(4096); // type index or mdatadata token writer.putUnsignedShort(1); // Register index @@ -3207,7 +3207,7 @@ public class SymbolsTest extends AbstractGenericTest { PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof AttributedLocalOrParameterRelativeToAlternateFramePointerMsSymbol, + symbol instanceof AttribLocOrParamReltoAMPMsSymbol, true); String result = symbol.toString().trim(); assertEquals("ATTR_REGREL: al+00003000, [0001:00001000]: Param: 4096 Address Taken," + @@ -3483,9 +3483,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testDefinedSingleAddressRangeForSubfieldMsSymbol() throws PdbException { + public void testSubfieldDARMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(DefinedSingleAddressRangeForSubfieldMsSymbol.PDB_ID); + writer.putUnsignedShort(SubfieldDARMsSymbol.PDB_ID); writer.putUnsignedInt(1); // DIA program to eval value of the symbol writer.putUnsignedInt(0x10); // Offset in parent variable byte[] range = createLocalVariableAddressRangeBuffer(0x2000, 1, 0x1000); @@ -3496,7 +3496,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putBytes(gap2); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof DefinedSingleAddressRangeForSubfieldMsSymbol, true); + assertEquals(symbol instanceof SubfieldDARMsSymbol, true); String result = symbol.toString().trim(); assertEquals("DEFRANGE_SUBFIELD: offset at 0010, DIA Program NI: 0001," + " Range: [0001:00002000] - [0001:00003000]," + @@ -3504,9 +3504,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testDefinedSingleAddressRangeForEnregisteredSymbolMsSymbol() throws PdbException { + public void testEnregisteredSymbolDARMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol.PDB_ID); + writer.putUnsignedShort(EnregisteredSymbolDARMsSymbol.PDB_ID); writer.putUnsignedShort(1); // register to hold value fo the symbol // attribute (bit 0: 1=may have no user name on one of the control flow paths writer.putUnsignedShort(0x01); @@ -3518,7 +3518,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putBytes(gap2); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof DefinedSingleAddressRangeForEnregisteredSymbolMsSymbol, + assertEquals(symbol instanceof EnregisteredSymbolDARMsSymbol, true); String result = symbol.toString().trim(); assertEquals("DEFRANGE_REGISTER:Attributes: MayAvailable al" + @@ -3527,9 +3527,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testDefinedSingleAddressRangeForFramePointerRelativeMsSymbol() throws PdbException { + public void testFramePointerRelativeDARMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(DefinedSingleAddressRangeForFramePointerRelativeMsSymbol.PDB_ID); + writer.putUnsignedShort(FramePointerRelativeDARMsSymbol.PDB_ID); writer.putInt(0x1000); // offset to frame pointer byte[] range = createLocalVariableAddressRangeBuffer(0x2000, 1, 0x1000); writer.putBytes(range); @@ -3539,7 +3539,7 @@ public class SymbolsTest extends AbstractGenericTest { writer.putBytes(gap2); PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof DefinedSingleAddressRangeForFramePointerRelativeMsSymbol, + assertEquals(symbol instanceof FramePointerRelativeDARMsSymbol, true); String result = symbol.toString().trim(); assertEquals("DEFRANGE_FRAMEPOINTER_REL: FrameOffset: 1000" + @@ -3548,11 +3548,11 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testDefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol() + public void testEnregisteredFieldOfSymbolDARMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol.PDB_ID); + EnregisteredFieldOfSymbolDARMsSymbol.PDB_ID); writer.putUnsignedShort(1); // register holding the value of the symbol // attribute (bit 0: 1=may have no user name on one of the control flow paths writer.putUnsignedShort(0x01); @@ -3567,7 +3567,7 @@ public class SymbolsTest extends AbstractGenericTest { PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof DefinedSingleAddressRangeForEnregisteredFieldOfSymbolMsSymbol, true); + symbol instanceof EnregisteredFieldOfSymbolDARMsSymbol, true); String result = symbol.toString().trim(); assertEquals("DEFRANGE_SUBFIELD_REGISTER: offset at 0010: Attributes: MayAvailable al" + " Range: [0001:00002000] - [0001:00003000]," + @@ -3575,27 +3575,27 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testDefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol() + public void testFramePointerRelativeFullScopeDARMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol.PDB_ID); + FramePointerRelativeFullScopeDARMsSymbol.PDB_ID); writer.putInt(0x0100); // offset to frame pointer PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof DefinedSingleAddressRangeForFramePointerRelativeFullScopeMsSymbol, + symbol instanceof FramePointerRelativeFullScopeDARMsSymbol, true); String result = symbol.toString().trim(); assertEquals("DEFRANGE_FRAMEPOINTER_REL_FULL_SCOPE: FrameOffset: 0100 FULL_SCOPE", result); } @Test - public void testDefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol() + public void testEnregisteredSymbolRelativeDARMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); writer.putUnsignedShort( - DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol.PDB_ID); + EnregisteredSymbolRelativeDARMsSymbol.PDB_ID); writer.putUnsignedShort(1); // register holding base pointer of symbol // spilled member for s.i. (1 bit) // padding for future (3 bits) @@ -3611,7 +3611,7 @@ public class SymbolsTest extends AbstractGenericTest { PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); assertEquals( - symbol instanceof DefinedSingleAddressRangeForEnregisteredSymbolRelativeMsSymbol, true); + symbol instanceof EnregisteredSymbolRelativeDARMsSymbol, true); String result = symbol.toString().trim(); assertEquals( "DEFRANGE_REGISTER_REL: [al + 0100] spilledUserDefinedTypeMember offset at 16" + @@ -3735,9 +3735,9 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testDefinedAddressRangeHighLevelShaderLanguageMsSymbol() throws PdbException { + public void testHighLevelShaderLanguageRegDimDARMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(DefinedAddressRangeHighLevelShaderLanguageMsSymbol.PDB_ID); + writer.putUnsignedShort(HighLevelShaderLanguageRegDimDARMsSymbol.PDB_ID); writer.putUnsignedShort(1); // register type from HLSLREG int registerSpaceDimensionality = 2; // valid: 0, 1, 2. int spilledUdtMember = 1; // 1=true. @@ -3759,7 +3759,7 @@ public class SymbolsTest extends AbstractGenericTest { } PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof DefinedAddressRangeHighLevelShaderLanguageMsSymbol, true); + assertEquals(symbol instanceof HighLevelShaderLanguageRegDimDARMsSymbol, true); String result = symbol.toString().trim(); assertEquals("DEFRANGE_HLSL: al, RegisterIndices = 2, SAMPLER" + " Range: [0001:00002000] - [0001:00003000]," + @@ -3767,10 +3767,10 @@ public class SymbolsTest extends AbstractGenericTest { } @Test - public void testDefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol() + public void testDeferredProcedureCallPointerTagRegDimDARMsSymbol() throws PdbException { PdbByteWriter writer = new PdbByteWriter(); - writer.putUnsignedShort(DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol.PDB_ID); + writer.putUnsignedShort(DeferredProcedureCallPointerTagRegDimDARMsSymbol.PDB_ID); writer.putUnsignedShort(1); // register type from HLSLREG int registerSpaceDimensionality = 2; // valid: 0, 1, 2. int spilledUdtMember = 1; // 1=true. @@ -3792,7 +3792,7 @@ public class SymbolsTest extends AbstractGenericTest { } PdbByteReader reader = new PdbByteReader(writer.get()); AbstractMsSymbol symbol = symbolParser.parse(reader); - assertEquals(symbol instanceof DefinedAddressRangeDeferredProcedureCallPointerTagMsSymbol, + assertEquals(symbol instanceof DeferredProcedureCallPointerTagRegDimDARMsSymbol, true); String result = symbol.toString().trim(); assertEquals("DEFRANGE_DPC_PTR_TAG: al, RegisterIndices = 2, SAMPLER" +