darkkirb/old-DasOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Assembler now provides single byte ASCII literals enclosed in ', adds some memory operations to the example file.

Browse source
This commit is contained in:
Felix Queißner 2016-05-21 19:27:02 +02:00
parent 5072f2c51e
commit ad718a930e
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
prototypes/supervm-asm/assembler.cs
View file

@ -74,7 +74,7 @@ namespace supervm_asm
{ {
static Regex annotationMatcher = new Regex(@"\[\s*(.*?)\s*\]", RegexOptions.Compiled); static Regex annotationMatcher = new Regex(@"\[\s*(.*?)\s*\]", RegexOptions.Compiled);
static Regex labelMatcher = new Regex(@"^(\w+):\s*(.*)\s*$", RegexOptions.Compiled); static Regex labelMatcher = new Regex(@"^(\w+):\s*(.*)\s*$", RegexOptions.Compiled);
static Regex instructionMatcher = new Regex(@"(\w+)(?:\s+(@?\w+))?", RegexOptions.Compiled); static Regex instructionMatcher = new Regex(@"(\w+)(?:\s+(@?\w+|'.'))?", RegexOptions.Compiled);
public static ulong[] Assemble(string src) public static ulong[] Assemble(string src)
{ {
@ -129,6 +129,10 @@ namespace supervm_asm
// Add patch note for labels. // Add patch note for labels.
patches.Add(code.Count, argstring.Substring(1)); patches.Add(code.Count, argstring.Substring(1));
} }
else if (argstring.StartsWith("'"))
{
argument = (uint)argstring[1];
}
else if (argstring.StartsWith("0x")) else if (argstring.StartsWith("0x"))
{ {
argument = Convert.ToUInt32(argstring.Substring(2), 16); argument = Convert.ToUInt32(argstring.Substring(2), 16);

27
prototypes/supervm-asm/testcode.asm
View file

@ -1,21 +1,30 @@
 
[i0:arg] syscall [ci:1] 'H'
[i0:arg] syscall [ci:1] 'a'
[i0:arg] syscall [ci:1] 'l'
[i0:arg] syscall [ci:1] 'l'
[i0:arg] syscall [ci:1] 'o'
load 0
load 1
load 2
load 3
store 67
store 66
store 65
store 64
push 0 ; Some comment push 0 ; Some comment
loop: _loop:
dup dup
[i0:arg] sub 10 [f:yes] [r:discard] [i0:arg] sub 10 [f:yes] [r:discard]
[ex(z)=1] jmp @end [ex(z)=1] jmp @_end
[i0:arg] add 1 [i0:arg] add 1
jmp @loop jmp @_loop
end: _end:
syscall 0 ; Exit syscall [ci:0]; Exit