zune/ZuneUIXTools
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneUIXTools.git synced 2026-07-27 13:11:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add support for string-encodable constants to assembler and disassembler

Browse Source
This commit is contained in:
Yoshi Askharoun
2024-02-12 12:16:31 -06:00
parent 07840d5ee5
commit f0f712f9d9
3 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/MicrosoftIris
+1 -1
Submodule libs/MicrosoftIris updated: a5b9b12908...23d20873cf
libs/UIX.Asm/AsmMarkupLoader.cs
+35 -17
View File
@@ -12,9 +12,9 @@ namespace Microsoft.Iris.Asm;
internal class AsmMarkupLoader
{
private string _asmSource;
private LoadPass _currentValidationPass;
private readonly string _asmSource;
private readonly AsmMarkupLoadResult _loadResult;
private LoadPass _currentValidationPass;
private bool _usingSharedBinaryDataTable;
private SourceMarkupImportTables _importTables;
private ObjectSection _objectSection;
@@ -55,25 +55,13 @@ internal class AsmMarkupLoader
return _importedNamespaces[prefix];
}
public TypeSchema ResolveTypeFromQualifiedName(string qualifiedName)
public TypeSchema ResolveTypeFromQualifiedName(QualifiedTypeName qualifiedName)
{
if (qualifiedName == null)
throw new ArgumentNullException(nameof(qualifiedName));
string typeName;
LoadResult result;
int idx = qualifiedName.IndexOf(':');
if (idx <= 0)
{
typeName = qualifiedName[..idx];
result = FindDependency(qualifiedName[..idx]);
}
else
{
typeName = qualifiedName;
result = _loadResult;
}
var typeName = qualifiedName.TypeName;
var result = FindDependency(qualifiedName.NamespacePrefix);
return result.ExportTable.Where(e => e.Name == typeName).FirstOrDefault()
?? throw new Exception($"No type with the name '{typeName}' was exported from {result.Uri}");
@@ -213,6 +201,36 @@ internal class AsmMarkupLoader
ByteCodeReader reader = null;
if (!HasErrors)
{
// Add constants
var stringTypeSchema = UIXTypes.MapIDToType(UIXTypeID.String);
foreach (var constant in Program.Body.OfType<ConstantDirective>())
{
object constantValue;
var constantTypeSchema = ResolveTypeFromQualifiedName(constant.TypeName);
if (constantTypeSchema.SupportsTypeConversion(stringTypeSchema))
{
var parseResult = constantTypeSchema.TypeConverter(constant.Content, stringTypeSchema, out constantValue);
if (parseResult.Failed)
{
ReportError($"Failed to create an instance of '{constant.TypeName}' from '{constant.Content}'", constant);
continue;
}
}
else
{
ReportError($"'{constant.TypeName}' cannot be constructed from a string, and UIXA does not yet support XML construction.", constant);
continue;
}
var mode = constantTypeSchema.SupportsBinaryEncoding
? MarkupConstantPersistMode.Binary
: MarkupConstantPersistMode.FromString;
constantsTable.Add(constantTypeSchema, constantValue, mode);
}
reader = _objectSection.Encode();
UpdateExportOffsets();
}
libs/UIX.Asm/Disassembler.cs
+18 -8
View File
@@ -136,19 +136,19 @@ public class Disassembler
{
var constantsTable = _loadResult.ConstantsTable;
List<(int c, TypeSchema typeSchema, object constantValue)> constants = new();
bool canUsePersistList = constantsTable.PersistList is not null;
if (canUsePersistList)
{
var constants = _loadResult.ConstantsTable.PersistList;
var persistedList = _loadResult.ConstantsTable.PersistList;
for (int c = 0; c < constants.Length; c++)
for (int c = 0; c < persistedList.Length; c++)
{
var persistedConstant = constants[c];
var persistedConstant = persistedList[c];
var typeSchema = persistedConstant.Type;
var qualifiedTypeName = GetQualifiedName(typeSchema);
yield return new ConstantDirective($"const{c:D}", qualifiedTypeName, persistedConstant.Data.ToString());
constants.Add((c, typeSchema, persistedConstant));
}
}
else
@@ -169,10 +169,20 @@ public class Disassembler
var runtimeType = constantValue.GetType();
var typeSchema = _loadResult.ImportTables.TypeImports.FirstOrDefault(t => t.RuntimeType == runtimeType);
QualifiedTypeName qualifiedTypeName = GetQualifiedName(typeSchema);
yield return new ConstantDirective($"const{c:D}", qualifiedTypeName, constantValue.ToString());
constants.Add((c, typeSchema, constantValue));
}
}
foreach (var (c, typeSchema, constantValue) in constants)
{
string encodedValue = constantValue is IStringEncodable encodable
? encodable.EncodeString()
: constantValue.ToString();
QualifiedTypeName qualifiedTypeName = GetQualifiedName(typeSchema);
yield return new ConstantDirective($"const{c:D}", qualifiedTypeName, encodedValue);
}
}
public IEnumerable<IBodyItem> GetCode()