creeperlv/SVM
1
0
Fork 0
mirror of https://github.com/creeperlv/SVM.git synced 2026-01-10 20:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working on making Linker to support multiple instruction data as one instruction.

Browse Source
This commit is contained in:
Creeper Lv
2025-07-30 01:24:02 +10:00
parent be8a9768ec
commit 29407c690b
4 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SVM.Assembler.Core/ISADefinition.cs
View File

@@ -116,7 +116,15 @@ namespace SVM.Assembler.Core
Trace.WriteLine($"ParseDefinition:{node.Name}");
InstructionDefinition instDefinition = new InstructionDefinition();
var PIAttr = node.Attributes.GetNamedItem("PrimaryInstruction");
var ICAttr = node.Attributes.GetNamedItem("InstructionCount");
if (PIAttr == null) return false;
if (ICAttr != null)
{
if (int.TryParse(ICAttr.InnerText, out var ic))
{
instDefinition.InstructionCount = ic;
}
}
if (!Enum.TryParse<PrimaryInstruction>(PIAttr.InnerText, out var pi))
{
return false;

1
src/SVM.Assembler.Core/InstructionDefinition.cs
View File

@@ -8,6 +8,7 @@ namespace SVM.Assembler.Core
public class InstructionDefinition
{
public PrimaryInstruction PrimaryInstruction = PrimaryInstruction.Nop;
public int InstructionCount = 1;
public List<string> Aliases = new List<string>();
public List<InstructionParameter> ParameterPattern = new List<InstructionParameter>();
}

74
src/SVM.Assembler.Core/Linker.cs
View File

@@ -64,6 +64,38 @@ namespace SVM.Assembler.Core
registerID = byte.MaxValue;
return false;
}
public static bool TryParseInt32(string input, LinkingContext context, out int value)
{
if (int.TryParse(input, out value))
{
return true;
}
else
{
if (context.IntermediateObject.TryGetConst(input, out var realStr))
{
return TryParseInt32(realStr, context, out value);
}
}
value = byte.MaxValue;
return false;
}
public static bool TryParseInt64(string input, LinkingContext context, out long value)
{
if (long.TryParse(input, out value))
{
return true;
}
else
{
if (context.IntermediateObject.TryGetConst(input, out var realStr))
{
return TryParseInt64(realStr, context, out value);
}
}
value = byte.MaxValue;
return false;
}
public unsafe static void WriteData(SVMInstruction* inst, SVMNativeTypes nativeType, int Pos, byte* dataStart)
{
var size = nativeType switch
@@ -227,10 +259,10 @@ namespace SVM.Assembler.Core
}
return false;
}
public unsafe static OperationResult<SVMInstruction> translate(InstructionDefinition def, LinkingContext context, IntermediateInstruction iinstruction)
public unsafe static OperationResult<bool> translate(InstructionDefinition def, LinkingContext context, IntermediateInstruction iinstruction, SVMInstruction* instruction)
{
OperationResult<SVMInstruction> result = new OperationResult<SVMInstruction>();
SVMInstruction instruction = new SVMInstruction();
OperationResult<bool> result = new OperationResult<bool>(false);
//SVMInstruction instruction = new SVMInstruction();
for (int i = 0; i < iinstruction.Parameters.Count; i++)
{
var para = iinstruction.Parameters[i];
@@ -243,31 +275,42 @@ namespace SVM.Assembler.Core
if (converter.StartsWith("InternalEnum:"))
{
var enumName = converter["InternalEnum:".Length..];
ProcessInternalEnum(enumName, para.Content, paraDef, context, &instruction);
ProcessInternalEnum(enumName, para.Content, paraDef, context, instruction);
}
else
if (converter.StartsWith("Enum:"))
{
var enumName = converter["Enum:".Length..];
ProcessInternalEnum(enumName, para.Content, paraDef, context, &instruction);
ProcessInternalEnum(enumName, para.Content, paraDef, context, instruction);
}
else
{
switch (converter)
{
case "Register":
if (!TryParseRegister(para.Content, context, out var registerID))
{
return result;
if (!TryParseRegister(para.Content, context, out var registerID))
{
return result;
}
WriteData(instruction, paraDef.ExpectdValue.Type, paraDef.ExpectdValue.Pos, &registerID);
}
break;
case "Integer32":
{
if (!TryParseInt32(para.Content, context, out var registerID))
{
return result;
}
WriteData(instruction, paraDef.ExpectdValue.Type, paraDef.ExpectdValue.Pos, (byte*)&registerID);
}
WriteData(&instruction, paraDef.ExpectdValue.Type, paraDef.ExpectdValue.Pos, &registerID);
break;
default:
break;
}
}
}
result.Result = instruction;
result.Result = true;
return result;
}
public unsafe static OperationResult<ManagedSVMProgram?> Finialize(ISADefinition definition, IntermediateObject Obj)
@@ -296,12 +339,21 @@ namespace SVM.Assembler.Core
if (definition.InstructionDefinitions.TryGetValue(item.inst, out var def))
{
var inst = translate(def, context, item);
var instruction = stackalloc SVMInstruction[def.InstructionCount];
var inst = translate(def, context, item, instruction);
if (operationResult.CheckAndInheritErrorAndWarnings(inst))
{
return operationResult;
}
program.instructions.Add(inst.Result);
if (inst.Result)
{
for (int i = 0; i < def.InstructionCount; i++)
{
program.instructions.Add(instruction[i]);
}
}
}
}
program.Datas = new byte[offset];

14
src/SVM.Assembler/ISA.xml
View File

@@ -51,5 +51,19 @@
</InstructionParameter>
</Parameters>
</InstructionDefinition>
<InstructionDefinition PrimaryInstruction="SD" InstructionCount="2">
<Aliases>
<Alias Name="sd.int"/>
<Alias Name="sd.int32"/>
</Aliases>
<Parameters>
<InstructionParameter>
<MatchingItems>
<Item Id="Word"/>
</MatchingItems>
<ExpectedValue Type="Int32" Pos="8" Converter="Ingeter32" />
</InstructionParameter>
</Parameters>
</InstructionDefinition>
</Definitions>
</ISARoot>